• Linus Torvalds's avatar
    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · 7bfe0e66
    Linus Torvalds authored
    Pull input subsystem updates from Dmitry Torokhov:
     "- we finally merged driver for USB version of Synaptics touchpads
        (I guess most commonly found in IBM/Lenovo keyboard/touchpad combo);
    
       - a bunch of new drivers for embedded platforms (Cypress
         touchscreens, DA9052 OnKey, MAX8997-haptic, Ilitek ILI210x
         touchscreens, TI touchscreen);
    
       - input core allows clients to specify desired clock source for
         timestamps on input events (EVIOCSCLOCKID ioctl);
    
       - input core allows querying state of all MT slots for given event
         code via EVIOCGMTSLOTS ioctl;
    
       - various driver fixes and improvements."
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (45 commits)
      Input: ili210x - add support for Ilitek ILI210x based touchscreens
      Input: altera_ps2 - use of_match_ptr()
      Input: synaptics_usb - switch to module_usb_driver()
      Input: convert I2C drivers to use module_i2c_driver()
      Input: convert SPI drivers to use module_spi_driver()
      Input: omap4-keypad - move platform_data to <linux/platform_data>
      Input: kxtj9 - who_am_i check value and initial data rate fixes
      Input: add driver support for MAX8997-haptic
      Input: tegra-kbc - revise device tree support
      Input: of_keymap - add device tree bindings for simple key matrices
      Input: wacom - fix physical size calculation for 3rd-gen Bamboo
      Input: twl4030-vibra - really switch from #if to #ifdef
      Input: hp680_ts_input - ensure arguments to request_irq and free_irq are compatible
      Input: max8925_onkey - avoid accessing input device too early
      Input: max8925_onkey - allow to be used as a wakeup source
      Input: atmel-wm97xx - convert to dev_pm_ops
      Input: atmel-wm97xx - set driver owner
      Input: add cyttsp touchscreen maintainer entry
      Input: cyttsp - remove useless checks in cyttsp_probe()
      Input: usbtouchscreen - add support for Data Modul EasyTouch TP 72037
      ...
    7bfe0e66
timekeeping.c 33.8 KB