• Linus Torvalds's avatar
    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · fb378df5
    Linus Torvalds authored
    Pull second round of input updates from Dmitry Torokhov:
     "Mostly simple bug fixes, although we do have one brand new driver for
      Microchip AR1021 i2c touchscreen.
    
      Also there is the change to stop trying to use i8042 active
      multiplexing by default (it is still possible to activate it via
      i8042.nomux=0 on boxes that implement it)"
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
      Input: xpad - add Thrustmaster as Xbox 360 controller vendor
      Input: xpad - add USB ID for Thrustmaster Ferrari 458 Racing Wheel
      Input: max77693-haptic - fix state check in imax77693_haptic_disable()
      Input: xen-kbdfront - free grant table entry in xenkbd_disconnect_backend
      Input: alps - fix v4 button press recognition
      Input: i8042 - disable active multiplexing by default
      Input: i8042 - add noloop quirk for Asus X750LN
      Input: synaptics - gate forcepad support by DMI check
      Input: Add Microchip AR1021 i2c touchscreen
      Input: cros_ec_keyb - add of match table
      Input: serio - avoid negative serio device numbers
      Input: avoid negative input device numbers
      Input: automatically set EV_ABS bit in input_set_abs_params
      Input: adp5588-keys - cancel workqueue in failure path
      Input: opencores-kbd - switch to using managed resources
      Input: evdev - fix EVIOCG{type} ioctl
    fb378df5
adp5588-keys.c 16 KB