tree 8ff2cc5b0d1a11c87a0e2576d6fe863b87faf69a
parent be9c6d9169705504296bdb42ffec8f406691d99f
parent 88ce3c3ca3df754e8a2a63b01c38bd1667fcae70
author Linus Torvalds <torvalds@linux-foundation.org> 1373763913 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1373763913 -0700

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

Pull second round of input updates from Dmitry Torokhov:
 "An update to Elantech driver to support hardware v7, fix to the new
  cyttsp4 driver to use proper addressing, ads7846 device tree support
  and nspire-keypad got a small cleanup."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: nspire-keypad - replace magic offset with define
  Input: elantech - fix for newer hardware versions (v7)
  Input: cyttsp4 - use 16bit address for I2C/SPI communication
  Input: ads7846 - add device tree bindings
  Input: ads7846 - make sure we do not change platform data