Skip to content
  • Linus Torvalds's avatar
    Merge branch 'for-linus' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/jikos/hid · 20df1578
    Linus Torvalds authored
    Pull HID updates from Jiri Kosina:
    
     - high resolution mode for Dell canvas support, from Benjamin Tissoires
    
     - pen handling fixes for the Wacom driver, from Jason Gerecke
    
     - i2c-hid: Apollo-Lake based laptops improvements, from Hans de Goede
    
     - Input/Core: eraser tool support, from Ping Cheng
    
     - new ALPS touchpad (T4, found currently on HP EliteBook 1000, Zbook
       Stduio and HP Elite book x360) supportm from Masaki Ota
    
     - other smaller assorted fixes
    
    * 'for-linus' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (33 commits)
      HID: cp2112: fix broken gpio_direction_input callback
      HID: cp2112: fix interface specification URL
      HID: Wacom: switch Dell canvas into highres mode
      HID: wacom: generic: Send BTN_STYLUS3 when both barrel switches are set
      HID: sony: Fix SHANWAN pad rumbling on USB
      HID: i2c-hid: Add no-irq-after-reset quirk for 0911:5288 device
      HID: add backlight level quirk for Asus ROG laptops
      HID: cp2112: add HIDRAW dependency
      HID: Add ID 044f:b605 ThrustMaster, Inc. force feedback Racing Wheel
      HID: hid-logitech: remove redundant assignment to pointer value
      HID: wacom: generic: Recognize WACOM_HID_WD_PEN as a type of pen collection
      HID: rmi: Check that a device is a RMI device before calling RMI functions
      HID: add multi-input quirk for GamepadBlock
      HID: alps: add new U1 device ID
      HID: alps: add support for Alps T4 Touchpad device
      HID: alps: remove variables local to u1_init() from the device struct
      HID: alps: properly handle max_fingers and minimum on X and Y axis
      HID: alps: Separate U1 device code
      HID: alps: delete unnecessary struct u1_dev devInfo
      HID: usbhid: Convert timers to use timer_setup()
      ...
    20df1578