Jiri Kosina b3aec7b686 Merge branch 'upstream' into for-linus ... Conflicts: drivers/hid/hid-core.c drivers/hid/hid-ids.h		2011-10-25 09:59:04 +02:00
..
hid-core.c	HID: usbhid: cancel timer for retry synchronously	2011-10-13 18:21:58 +02:00
hid-pidff.c	HID: Add and use hid_<level>: dev_<level> equivalents	2010-12-10 15:10:38 +01:00
hid-quirks.c	Merge branch 'upstream' into for-linus	2011-10-25 09:59:04 +02:00
hiddev.c	HID: hiddev: potential info leak in hiddev_ioctl()	2011-09-27 01:33:10 +02:00
Kconfig	kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT	2011-01-20 17:02:05 -08:00
Makefile	HID: usbhid: Clean up makefile (-y instead of -objs)	2010-11-18 10:43:18 +01:00
usbhid.h	HID: usbhid: base runtime PM on modern API	2010-12-22 19:06:53 +01:00
usbkbd.c	HID: Add and use hid_<level>: dev_<level> equivalents	2010-12-10 15:10:38 +01:00
usbmouse.c	USB: rename usb_buffer_alloc() and usb_buffer_free() users	2010-05-20 13:21:38 -07:00