Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jikos/hid
* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jikos/hid: USB HID: handle multi-interface devices for Apple macbook pro properly HID: move away from DEBUG defines in favor of CONFIG_HID_DEBUG USB HID: fix bogus comment in hid_get_class_descriptor() USB HID: remove hid_find_field_by_usage() HID: API - fix leftovers of hidinput API in USB HID HID: hid debug from hid-debug.h to hid layer hid: force feedback driver for PantherLord USB/PS2 2in1 Adapter hid: quirk for multi-input devices with unneeded output reports hid: allow force feedback for multi-input devices
Showing
- drivers/hid/Kconfig 14 additions, 0 deletionsdrivers/hid/Kconfig
- drivers/hid/Makefile 2 additions, 9 deletionsdrivers/hid/Makefile
- drivers/hid/hid-core.c 3 additions, 5 deletionsdrivers/hid/hid-core.c
- drivers/hid/hid-debug.c 764 additions, 0 deletionsdrivers/hid/hid-debug.c
- drivers/hid/hid-input.c 25 additions, 10 deletionsdrivers/hid/hid-input.c
- drivers/usb/input/Kconfig 8 additions, 0 deletionsdrivers/usb/input/Kconfig
- drivers/usb/input/Makefile 3 additions, 0 deletionsdrivers/usb/input/Makefile
- drivers/usb/input/hid-core.c 31 additions, 50 deletionsdrivers/usb/input/hid-core.c
- drivers/usb/input/hid-ff.c 3 additions, 0 deletionsdrivers/usb/input/hid-ff.c
- drivers/usb/input/hid-plff.c 129 additions, 0 deletionsdrivers/usb/input/hid-plff.c
- include/linux/hid-debug.h 18 additions, 731 deletionsinclude/linux/hid-debug.h
- include/linux/hid.h 5 additions, 12 deletionsinclude/linux/hid.h
Please register or sign in to comment