Jiri Kosina 8b66a16f25 Merge branch 'uc-logic' into for-linus ... Conflicts: drivers/hid/hid-ids.h drivers/hid/hid-lg.c drivers/hid/usbhid/hid-quirks.c		2010-10-23 22:49:32 +02:00
..
hid-core.c	Merge branches '3m', 'egalax', 'logitech', 'magicmouse', 'ntrig' and 'roccat' into for-linus	2010-10-23 22:47:38 +02:00
hid-pidff.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
hid-quirks.c	Merge branch 'uc-logic' into for-linus	2010-10-23 22:49:32 +02:00
hiddev.c	Merge branches 'upstream' and 'upstream-fixes' into for-linus	2010-10-23 22:44:36 +02:00
Kconfig	HID: make boot protocol drivers depend on EMBEDDED	2009-01-04 01:00:53 +01:00
Makefile	HID: remove hid-ff	2008-10-14 23:51:01 +02:00
usbhid.h	HID: fix hiddev's use of usb_find_interface	2010-09-14 10:58:42 +02:00
usbkbd.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid	2010-05-21 10:51:03 -07:00
usbmouse.c	USB: rename usb_buffer_alloc() and usb_buffer_free() users	2010-05-20 13:21:38 -07:00