Jiri Kosina 3390e579b3 Merge branch 'for-4.7/upstream' into for-linus ... Conflicts: drivers/hid/usbhid/hid-quirks.c		2016-05-17 12:41:22 +02:00
..
hid-core.c	HID: usbhid: fix inconsistent reset/resume/reset-resume behavior	2016-03-24 15:26:20 +01:00
hid-pidff.c	HID: pidff: effect can't be NULL	2015-03-27 16:03:26 +01:00
hid-quirks.c	Merge branch 'for-4.7/upstream' into for-linus	2016-05-17 12:41:22 +02:00
hiddev.c	HID: use hid_hw_wait() instead of direct call to usbhid	2013-02-25 13:26:41 +01:00
Kconfig	HID: Fix the generic Kconfig options	2012-06-25 17:25:00 +02:00
Makefile	HID: Use Kbuild idiom in Makefiles	2015-01-21 22:23:20 +01:00
usbhid.h	HID: usbhid: use to_usb_device	2015-12-28 13:13:20 +01:00
usbkbd.c	HID: usbkbd: fix inconsistent debugging output	2013-11-19 11:32:04 +01:00
usbmouse.c	USB: usbmouse.c: remove err() usage	2012-04-25 14:48:20 -07:00