Merge branches 'hyperv', 'multitouch', 'roccat', 'upstream', 'upstream-fixes', 'wacom...
authorJiri Kosina <jkosina@suse.cz>
Thu, 5 Jan 2012 14:51:02 +0000 (15:51 +0100)
committerJiri Kosina <jkosina@suse.cz>
Thu, 5 Jan 2012 14:51:02 +0000 (15:51 +0100)
commite0273728564a395a13cfed70e34da4f2613d2d44
treee57de35badafff2cc3afcd8896479242b94cc3ec
parent74c4fb058083b47571a4f76dcfce95085f2d8098
parent11576c6114c3b6505aea2e0c988bedb856a0e20c
parentd41c2a7011dffc60571eab8dc4e2a297ef106f44
parent4371ea8202e98c8ef77ca887de3b19affbb3498f
parentcd07655e732b265eb12a5804ddf7ffae945c9ab9
parent78761ff9bc4e944e0b4e5df1e7eedcfdbb1a9a1a
parent90120d66974ecf22c32d8cbb2347097ce4144403
Merge branches 'hyperv', 'multitouch', 'roccat', 'upstream', 'upstream-fixes', 'wacom' and 'wiimote' into for-linus
drivers/hid/Kconfig
drivers/hid/Makefile
drivers/hid/hid-core.c
drivers/hid/hid-debug.c
drivers/hid/hid-emsff.c
drivers/hid/hid-ids.h
drivers/hid/hid-multitouch.c
drivers/hid/hid-picolcd.c
drivers/hid/hid-roccat-common.c
drivers/hid/usbhid/hid-quirks.c
include/linux/hid.h