• Linus Torvalds's avatar
    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · 4b6920ba
    Linus Torvalds authored
    Pull input updates from Dmitry Torokhov:
     "Just a few small fixups and switching a couple of Thinkpads to SMBus
      for touchpads as PS/2 emulation is not working well"
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
      Input: synaptics - enable SMBus on ThinkPad E480 and E580
      Input: imx_keypad - make sure keyboard can always wake up system
      Input: iqs5xx - get axis info before calling input_mt_init_slots()
      Input: uinput - add compat ioctl number translation for UI_*_FF_UPLOAD
      Input: silead - add MSSL0017 to acpi_device_id
      Input: elantech - enable middle button support on 2 ThinkPads
      Input: elan_i2c - increment wakeup count if wake source
    4b6920ba
silead.c 15.4 KB