Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (47 commits) HID: fix mismerge in hid-lg HID: hidraw: fix window in hidraw_release HID: hid-sony: override usbhid_output_raw_report for Sixaxis HID: add absolute axis resolution calculation HID: force feedback support for Logitech RumblePad gamepad HID: support STmicroelectronics and Sitronix with hid-stantuml driver HID: magicmouse: Adjust major / minor axes to scale HID: Fix for problems with eGalax/DWAV multi-touch-screen HID: waltop: add support for Waltop Slim Tablet 12.1 inch HID: add NOGET quirk for AXIS 295 Video Surveillance Joystick HID: usbhid: remove unused hiddev_driver HID: magicmouse: Use hid-input parsing rather than bypassing it HID: trivial formatting fix HID: Add support for Logitech Speed Force Wireless gaming wheel HID: don't Send Feature Reports on Interrupt Endpoint HID: 3m: Adjust major / minor axes to scale HID: 3m: Correct touchscreen emulation HID: 3m: Convert to MT slots HID: 3m: Output proper orientation range HID: 3m: Adjust to sequential MT HID protocol ...
Showing
- Documentation/ABI/testing/sysfs-driver-hid-roccat-pyra 98 additions, 0 deletionsDocumentation/ABI/testing/sysfs-driver-hid-roccat-pyra
- Documentation/input/ntrig.txt 126 additions, 0 deletionsDocumentation/input/ntrig.txt
- drivers/hid/Kconfig 59 additions, 32 deletionsdrivers/hid/Kconfig
- drivers/hid/Makefile 6 additions, 0 deletionsdrivers/hid/Makefile
- drivers/hid/hid-3m-pct.c 72 additions, 55 deletionsdrivers/hid/hid-3m-pct.c
- drivers/hid/hid-a4tech.c 2 additions, 0 deletionsdrivers/hid/hid-a4tech.c
- drivers/hid/hid-apple.c 4 additions, 3 deletionsdrivers/hid/hid-apple.c
- drivers/hid/hid-cherry.c 4 additions, 3 deletionsdrivers/hid/hid-cherry.c
- drivers/hid/hid-core.c 16 additions, 7 deletionsdrivers/hid/hid-core.c
- drivers/hid/hid-cypress.c 5 additions, 4 deletionsdrivers/hid/hid-cypress.c
- drivers/hid/hid-debug.c 2 additions, 0 deletionsdrivers/hid/hid-debug.c
- drivers/hid/hid-egalax.c 11 additions, 5 deletionsdrivers/hid/hid-egalax.c
- drivers/hid/hid-elecom.c 4 additions, 3 deletionsdrivers/hid/hid-elecom.c
- drivers/hid/hid-ids.h 22 additions, 1 deletiondrivers/hid/hid-ids.h
- drivers/hid/hid-input.c 87 additions, 0 deletionsdrivers/hid/hid-input.c
- drivers/hid/hid-kye.c 4 additions, 3 deletionsdrivers/hid/hid-kye.c
- drivers/hid/hid-lg.c 45 additions, 4 deletionsdrivers/hid/hid-lg.c
- drivers/hid/hid-lg.h 6 additions, 0 deletionsdrivers/hid/hid-lg.h
- drivers/hid/hid-lg2ff.c 2 additions, 2 deletionsdrivers/hid/hid-lg2ff.c
- drivers/hid/hid-lg4ff.c 136 additions, 0 deletionsdrivers/hid/hid-lg4ff.c
Loading
Please register or sign in to comment