]> 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)
commit83bc8583925a878b150c6934290427e3e954e590
treef245dd77a3dede97a80f8369d984334b56220752
parente97c8c7c8af80569f8a41a53654c9e3cd925b436
parenta65d1b4caf299a89a68ad29e8b019dfa630fcb6e
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