Skip to content
  • Linus Torvalds's avatar
    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid · 884316de
    Linus Torvalds authored
    Pull HID updates from Jiri Kosina:
    
     - new hid-alps driver for ALPS Touchpad-Stick device, from Masaki Ota
    
     - much improved and generalized HID led handling, and merge of
       specialized hid-thingm driver into this generic hid-led one, from
       Heiner Kallweit
    
     - i2c-hid power management improvements from Fu Zhonghui and Guohua
       Zhong
    
     - uhid initialization race fix from Roderick Colenbrander
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (21 commits)
      HID: add usb device id for Apple Magic Keyboard
      HID: hid-led: fix Delcom support on big endian systems
      HID: hid-led: add support for Greynut Luxafor
      HID: hid-led: add support for Delcom Visual Signal Indicator G2
      HID: hid-led: remove report id from struct hidled_config
      HID: alps: a few cleanups
      HID: remove ThingM blink(1) driver
      HID: hid-led: add support for ThingM blink(1)
      HID: hid-led: add support for reading from LED devices
      HID: hid-led: add support for devices with multiple independent LEDs
      HID: i2c-hid: set power sleep before shutdown
      HID: alps: match alps devices in core
      HID: thingm: simplify debug output code
      HID: alps: pass correct sizes to hid_hw_raw_request()
      HID: alps: struct u1_dev *priv is internal to the driver
      HID: add Alps I2C HID Touchpad-Stick support
      HID: led: fix config
      usb: misc: remove outdated USB LED driver
      HID: migrate USB LED driver from usb misc to hid
      HID: i2c_hid: enable i2c-hid devices to suspend/resume asynchronously
      ...
    884316de