• Linus Torvalds's avatar
    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · 16a12fa9
    Linus Torvalds authored
    Pull input subsystem updates from Dmitry Torokhov:
     - a big update from Mauro converting input documentation to ReST format
     - Synaptics PS/2 is now aware of SMBus companion devices, which means
       that we can now use native RMI4 protocol to handle touchpads, instead
       of relying on legacy PS/2 mode.
     - we removed support from BMA180 accelerometer from input devices as it
       is now handled properly by IIO
     - update to TSC2007 to corretcly report pressure
     - other miscellaneous driver fixes.
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (152 commits)
      Input: ar1021_i2c - use BIT to check for a bit
      Input: twl4030-pwrbutton - use input_set_capability() helper
      Input: twl4030-pwrbutton - use correct device for irq request
      Input: ar1021_i2c - enable touch mode during open
      Input: add uinput documentation
      dt-bindings: input: add bindings document for ar1021_i2c driver
      dt-bindings: input: rotary-encoder: fix typo
      Input: xen-kbdfront - add module parameter for setting resolution
      ARM: pxa/raumfeld: fix compile error in rotary controller resources
      Input: xpad - do not suggest writing to Dominic
      Input: xpad - don't use literal blocks inside footnotes
      Input: xpad - note that usb/devices is now at /sys/kernel/debug/
      Input: docs - freshen up introduction
      Input: docs - split input docs into kernel- and user-facing
      Input: docs - note that MT-A protocol is obsolete
      Input: docs - update joystick documentation a bit
      Input: docs - remove disclaimer/GPL notice
      Input: fix "Game console" heading level in joystick documentation
      Input: rotary-encoder - remove references to platform data from docs
      Input: move documentation for Amiga CD32