• Linus Torvalds's avatar
    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · 3e069ada
    Linus Torvalds authored
    Pull input updates from Dmitry Torokhov:
     "Items of note:
       - evdev users can now limit or mask the kind of events they will
         receive.  This will allow applications such as power manager or
         network manager to only be woken when user presses special keys
         such as KEY_POWER or KEY_WIFI and not be bothered with ordinary
         key presses coming from keyboard
       - support for FocalTech FT6236 touchscreen controller
       - support for ROHM BU21023/24 touchscreen controller
       - edt-ft5x06 touchscreen driver got a face lift and can now be used
         with FT5506
       - support for Google Fiber TV Box remote controls
       - improvements in xpad driver (with more to come)
       - several parport-based drivers have been switched to the new device
       - other miscellaneous driver improvements"
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (70 commits)
      HID: hid-gfrm: avoid warning for input_configured API change
      HID: hid-input: allow input_configured callback return errors
      Input: evdev - fix bug in checking duplicate clock change request
      Input: add userio module
      Input: evdev - add event-mask API
      Input: snvs_pwrkey - remove duplicated semicolon
      HID: hid-gfrm: Google Fiber TV Box remote controls
      Input: e3x0-button - update Kconfig description
      Input: tegra-kbc - drop use of IRQF_NO_SUSPEND flag
      Input: tegra-kbc - enable support for the standard "wakeup-source" property
      Input: xen - check return value of xenbus_printf
      Input: hp_sdc_rtc - fix y2038 problem in proc_show
      Input: nomadik-ske-keypad - fix a trivial typo
      Input: xpad - fix clash of presence handling with LED setting
      Input: edt-ft5x06 - work around FT5506 firmware bug
      Input: edt-ft5x06 - add support for FT5506
      Input: edt-ft5x06 - add support for different max support points
      Input: edt-ft5x06 - use max support points to determine how much to read
      Input: rotary-encoder - add support for quarter-period mode
      Input: rotary-encoder - use of_property_read_bool