]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'upstream' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Tue, 22 May 2012 09:32:31 +0000 (11:32 +0200)
committerJiri Kosina <jkosina@suse.cz>
Tue, 22 May 2012 09:32:31 +0000 (11:32 +0200)
commit07c5df2b9ba25a76e452c1b6b5208e52cddb8365
tree195cdd3973a1288eb84f51f0ec28a947b333c2c5
parentac547eb7fec6d8b9719d3b2839a76a448ae8984a
parent849f0afbbf2b9a5e66b27ab4efd094915f369764
Merge branch 'upstream' into for-linus

Conflicts:
drivers/hid/hid-core.c
drivers/hid/Kconfig
drivers/hid/Makefile
drivers/hid/hid-core.c
drivers/hid/hid-ids.h
drivers/hid/usbhid/hid-core.c
include/linux/hid.h