• Linus Torvalds's avatar
    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · bd7e8c99
    Linus Torvalds authored
    Pull input updates from Dmitry Torokhov:
    
     - a new driver for ADC driven joysticks
    
     - a new Zintix touchscreen driver
    
     - enhancements to Intel SoC button array driver
    
     - support for F3A "function" in Synaptics RMI4 driver
    
     - assorted driver fixups
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (29 commits)
      Input: Add MAINTAINERS entry for SiS i2c touch input driver
      Input: evdev - per-client waitgroups
      Input: synaptics - enable InterTouch for ThinkPad T14 Gen 1
      Input: synaptics - enable InterTouch for ThinkPad P1/X1E gen 2
      Input: synaptics-rmi4 - support bootloader v8 in f34v7
      Input: synaptics-rmi4 - add support for F3A
      Input: synaptics-rmi4 - rename f30_data to gpio_data
      Input: add zinitix touchscreen driver
      dt-bindings: input/touchscreen: add bindings for zinitix
      Input: joystick - add ADC attached joystick driver.
      dt-bindings: input: Add docs for ADC driven joystick
      Input: sun4i-ps2 - fix handling of platform_get_irq() error
      Input: twl4030_keypad - fix handling of platform_get_irq() error
      Input: omap4-keypad - fix handling of platform_get_irq() error
      Input: ep93xx_keypad - fix handling of platform_get_irq() error
      Input: stmfts - fix a & vs && typo
      Input: imx6ul_tsc - unify open/close and PM paths
      Input: imx6ul_tsc - clean up some errors in imx6ul_tsc_resume()
      Input: elants_i2c - fix typo for an attribute to show calibration count
      Input: elants_i2c - report resolution of ABS_MT_TOUCH_MAJOR by FW information.
      ...
    bd7e8c99
thinkpad_acpi.c 270 KB