Skip to content
  • Linus Torvalds's avatar
    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · 664fb230
    Linus Torvalds authored
    Pull input updates from Dmitry Torokhov:
     - big update to Wacom driver by Benjamin Tissoires, converting it to
       HID infrastructure and unifying USB and Bluetooth models
     - large update to ALPS driver by Hans de Goede, which adds support for
       newer touchpad models as well as cleans up and restructures the code
     - more changes to Atmel MXT driver, including device tree support
     - new driver for iPaq x3xxx touchscreen
     - driver for serial Wacom tablets
     - driver for Microchip's CAP1106
     - assorted cleanups and improvements to existing drover and input core
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (93 commits)
      Input: wacom - update the ABI doc according to latest changes
      Input: wacom - only register once the MODULE_* macros
      Input: HID - remove hid-wacom Bluetooth driver
      Input: wacom - add copyright note and bump version to 2.0
      Input: wacom - remove passing id for wacom_set_report
      Input: wacom - check for bluetooth protocol while setting OLEDs
      Input: wacom - handle Intuos 4 BT in wacom.ko
      Input: wacom - handle Graphire BT tablets in wacom.ko
      Input: wacom - prepare the driver to include BT devices
      Input: hyperv-keyboard - register as a wakeup source
      Input: imx_keypad - remove ifdef round PM methods
      Input: jornada720_ts - get rid of space indentation and use tab
      Input: jornada720_ts - switch to using managed resources
      Input: alps - Rushmore and v7 resolution support
      Input: mcs5000_ts - remove ifdef around power management methods
      Input: mcs5000_ts - protect PM functions with CONFIG_PM_SLEEP
      Input: ads7846 - release resources on failure for clean exit
      Input: wacom - add support for 0x12C ISDv4 sensor
      Input: atmel_mxt_ts - use deep sleep mode when stopped
      ARM: dts: am437x-gp-evm: Update binding for touchscreen size
      ...
    664fb230