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: hid-core.c: Adds GTCO CalComp Interwrite IPanel PIDs to blacklist HID: put usb_interface instead of usb_device into hid->dev to fix udevinfo breakage HID: add missing RX, RZ and RY enum values to hid-debug output HID: hid/hid-input.c doesn't need to include linux/usb/input.h HID: compilation fix when DEBUG_DATA is defined HID: proper LED-mapping for SpaceNavigator HID: update MAINTAINERS entry for USB-HID HID: GEYSER4_ISO needs quirk HID: fix some ARM builds due to HID brokenness - make USB_HID depend on INPUT
Showing
- MAINTAINERS 2 additions, 3 deletionsMAINTAINERS
- drivers/hid/hid-core.c 5 additions, 1 deletiondrivers/hid/hid-core.c
- drivers/hid/hid-input.c 16 additions, 4 deletionsdrivers/hid/hid-input.c
- drivers/usb/input/Kconfig 1 addition, 1 deletiondrivers/usb/input/Kconfig
- drivers/usb/input/hid-core.c 24 additions, 16 deletionsdrivers/usb/input/hid-core.c
- drivers/usb/input/hid-ff.c 3 additions, 2 deletionsdrivers/usb/input/hid-ff.c
- drivers/usb/input/hiddev.c 1 addition, 1 deletiondrivers/usb/input/hiddev.c
- drivers/usb/input/usbhid.h 3 additions, 0 deletionsdrivers/usb/input/usbhid.h
- include/linux/hid-debug.h 4 additions, 3 deletionsinclude/linux/hid-debug.h
Loading
Please register or sign in to comment