Jiri Kosina 4a247a4119 Merge branch 'upstream' into for-linus ... Conflicts: drivers/hid/Makefile		2012-03-20 13:18:05 +01:00
..
Kconfig	…
Makefile	…
hid-core.c	HID: usbhid: defer LED setting to a workqueue	2011-12-21 11:18:35 +01:00
hid-pidff.c	…
hid-quirks.c	Merge branch 'upstream' into for-linus	2012-03-20 13:18:05 +01:00
hiddev.c	HID: usbhid: fix dead lock between open and disconect	2012-02-02 09:48:00 +01:00
usbhid.h	HID: usbhid: defer LED setting to a workqueue	2011-12-21 11:18:35 +01:00
usbkbd.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid	2012-01-10 10:48:28 -08:00
usbmouse.c	…