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: (21 commits) USB HID: don't warn on idVendor == 0 USB HID: add 'quirks' module parameter USB HID: add support for dynamically-created quirks USB HID: clarify static quirk handling as squirks USB HID: encapsulate quirk handling into hid-quirks.c USB HID: EMS USBII device needs HID_QUIRK_MULTI_INPUT HID: update copyright and authorship macro HID: introduce proper zeroing of unused bits in output reports USB HID: add support for WiseGroup MP-8800 Quad Joypad USB HID: add FF support for Logitech Force 3D Pro Joystick USB HID: numlock quirk for dell W7658 keyboard USB HID: Logitech MX3000 keyboard needs report descriptor quirk USB HID: extend quirk for Logitech S510 keyboard USB HID: usbkbd/usbmouse - handle errors when registering devices USB HID: add QUIRK_HIDDEV for Belkin Flip KVM HID: enable dead keys on a belkin wireless keyboard USB HID: Thustmaster firestorm dual power v1 support USB HID: specify explicit size for hid_blacklist.quirks USB HID: fix retry & reset logic USB HID: consolidate vendor/product ids ...
Showing
- drivers/hid/Kconfig 2 additions, 0 deletionsdrivers/hid/Kconfig
- drivers/hid/Makefile 4 additions, 0 deletionsdrivers/hid/Makefile
- drivers/hid/hid-core.c 7 additions, 2 deletionsdrivers/hid/hid-core.c
- drivers/hid/hid-input.c 26 additions, 1 deletiondrivers/hid/hid-input.c
- drivers/hid/usbhid/Kconfig 149 additions, 0 deletionsdrivers/hid/usbhid/Kconfig
- drivers/hid/usbhid/Makefile 35 additions, 0 deletionsdrivers/hid/usbhid/Makefile
- drivers/hid/usbhid/hid-core.c 64 additions, 427 deletionsdrivers/hid/usbhid/hid-core.c
- drivers/hid/usbhid/hid-ff.c 2 additions, 0 deletionsdrivers/hid/usbhid/hid-ff.c
- drivers/hid/usbhid/hid-lgff.c 1 addition, 0 deletionsdrivers/hid/usbhid/hid-lgff.c
- drivers/hid/usbhid/hid-pidff.c 0 additions, 0 deletionsdrivers/hid/usbhid/hid-pidff.c
- drivers/hid/usbhid/hid-plff.c 0 additions, 0 deletionsdrivers/hid/usbhid/hid-plff.c
- drivers/hid/usbhid/hid-quirks.c 681 additions, 0 deletionsdrivers/hid/usbhid/hid-quirks.c
- drivers/hid/usbhid/hid-tmff.c 0 additions, 0 deletionsdrivers/hid/usbhid/hid-tmff.c
- drivers/hid/usbhid/hid-zpff.c 0 additions, 0 deletionsdrivers/hid/usbhid/hid-zpff.c
- drivers/hid/usbhid/hiddev.c 0 additions, 0 deletionsdrivers/hid/usbhid/hiddev.c
- drivers/hid/usbhid/usbhid.h 0 additions, 0 deletionsdrivers/hid/usbhid/usbhid.h
- drivers/hid/usbhid/usbkbd.c 9 additions, 4 deletionsdrivers/hid/usbhid/usbkbd.c
- drivers/hid/usbhid/usbmouse.c 11 additions, 4 deletionsdrivers/hid/usbhid/usbmouse.c
- drivers/usb/Makefile 0 additions, 3 deletionsdrivers/usb/Makefile
- drivers/usb/input/Kconfig 0 additions, 145 deletionsdrivers/usb/input/Kconfig
Loading
Please register or sign in to comment