Jiri Kosina 818b930bc1 Merge branches 'for-3.7/upstream-fixes', 'for-3.8/hidraw', 'for-3.8/i2c-hid', 'for-3.8/multitouch', 'for-3.8/roccat', 'for-3.8/sensors' and 'for-3.8/upstream' into for-linus ...

Conflicts:
	drivers/hid/hid-core.c

2012-12-12 21:41:55 +01:00

..

hid-core.c

…

hid-pidff.c

…

hid-quirks.c

Merge branches 'for-3.7/upstream-fixes', 'for-3.8/hidraw', 'for-3.8/i2c-hid', 'for-3.8/multitouch', 'for-3.8/roccat', 'for-3.8/sensors' and 'for-3.8/upstream' into for-linus

2012-12-12 21:41:55 +01:00

hiddev.c

…

Kconfig

…

Makefile

…

usbhid.h

…

usbkbd.c

…

usbmouse.c

…