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)
commit4a247a4119ee932e06e985e0a95a13c3eed4715b
tree42b6a7c9edf2f40c7b645a493d63bdb67e5f7100
parent77aa8e65f0e20c294907a9fa8af92a3dbe0e0a51
parent4d5df5d11e8027c11c1079205757527cbaade62d
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