]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'upstream' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Mon, 1 Oct 2012 12:37:51 +0000 (14:37 +0200)
committerJiri Kosina <jkosina@suse.cz>
Mon, 1 Oct 2012 12:37:51 +0000 (14:37 +0200)
commit4913119e6d64f7a763156d3601ea6880e881f0d7
treef245dd77a3dede97a80f8369d984334b56220752
parent1061db8b3a8be93a3ee516e75e24306bb6b31592
parentfc4809e5d7ce8339dece96456148b0b80006ddfc
Merge branch 'upstream' into for-linus

Conflicts:
drivers/hid/usbhid/hid-quirks.c
drivers/hid/Kconfig
drivers/hid/hid-core.c
drivers/hid/hid-ids.h
drivers/hid/hid-lenovo-tpkbd.c
drivers/hid/hid-lg.c
drivers/hid/hid-lg4ff.c
drivers/hid/hid-wacom.c
drivers/hid/hidraw.c
drivers/hid/usbhid/hid-quirks.c