Jiri Kosina a3cbe10e47 Merge branch 'upstream' into for-linus ... Conflicts: drivers/hid/usbhid/hid-quirks.c		2012-10-01 14:37:51 +02:00
..
hid-core.c	HID: keep dev_rdesc unmodified and use it for comparisons	2012-10-01 10:09:26 +02:00
hid-pidff.c
hid-quirks.c	Merge branch 'upstream' into for-linus	2012-10-01 14:37:51 +02:00
hiddev.c
Kconfig	HID: Fix the generic Kconfig options	2012-06-25 17:25:00 +02:00
Makefile
usbhid.h	HID: usbhid: replace HID_REPORTED_IDLE with HID_SUSPENDED	2012-07-20 11:24:24 +02:00
usbkbd.c
usbmouse.c