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)
commit56ccd186f1837dd418cd094f0e96b3196bbab9ef
tree195cdd3973a1288eb84f51f0ec28a947b333c2c5
parentb3d07e0344ea36dd3f3a2fdbfaab883e1c5ca69e
parentd1257081aecf44455fcab8675f1d54e8b242faa1
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