• Linus Torvalds's avatar
    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · f78e9de8
    Linus Torvalds authored
    Pull input updates from Dmitry Torokhov:
     "Just one new driver (Cypress StreetFighter touchkey), and no input
      core changes this time.
    
      Plus various fixes and enhancements to existing drivers"
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (54 commits)
      Input: iforce - fix control-message timeout
      Input: wacom_i2c - use macros for the bit masks
      Input: ili210x - reduce sample period to 15ms
      Input: ili210x - improve polled sample spacing
      Input: ili210x - special case ili251x sample read out
      Input: elantench - fix misreporting trackpoint coordinates
      Input: synaptics-rmi4 - Fix device hierarchy
      Input: i8042 - Add quirk for Fujitsu Lifebook T725
      Input: cap11xx - add support for cap1206
      Input: remove unused header <linux/input/cy8ctmg110_pdata.h>
      Input: ili210x - add ili251x firmware update support
      Input: ili210x - export ili251x version details via sysfs
      Input: ili210x - use resolution from ili251x firmware
      Input: pm8941-pwrkey - respect reboot_mode for warm reset
      reboot: export symbol 'reboot_mode'
      Input: max77693-haptic - drop unneeded MODULE_ALIAS
      Input: cpcap-pwrbutton - do not set input parent explicitly
      Input: max8925_onkey - don't mark comment as kernel-doc
      Input: ads7846 - do not attempt IRQ workaround when deferring probe
      Input: ads7846 - use input_set_capability()
      ...
    f78e9de8
reboot.c 21.5 KB