]> 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)
commit81fec206a71b1571177a3e652b6834c1f6a62972
tree195cdd3973a1288eb84f51f0ec28a947b333c2c5
parent96f7a71842dfb82fd5b7067b3be08e3ee009f445
parent153935ccb9ceaf134a3622afb44efbef9553c2af
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