]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'upstream' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Tue, 20 Mar 2012 12:18:05 +0000 (13:18 +0100)
committerJiri Kosina <jkosina@suse.cz>
Tue, 20 Mar 2012 12:18:05 +0000 (13:18 +0100)
commit23924333fbbf0ca9fe0e961470555c9dedb267d3
tree42b6a7c9edf2f40c7b645a493d63bdb67e5f7100
parentfc447323343ca033ac55c1a1cd971548cbcbeea2
parent7c34aa842414d46934420e8f312cca0db45d4382
Merge branch 'upstream' into for-linus

Conflicts:
drivers/hid/Makefile
drivers/hid/Kconfig
drivers/hid/Makefile
drivers/hid/hid-core.c
drivers/hid/hid-ids.h
drivers/hid/hid-multitouch.c
drivers/hid/hid-wacom.c
drivers/hid/usbhid/hid-quirks.c