tree 515cb6e1fea6da4671d526ad753ce5584ca2fe6e
parent d83763f4a6adb2f417c3288ee903982985ae949c
parent bbdb5c22e12507e7f1637091bc24fe4d33e128e5
author Linus Torvalds <torvalds@linux-foundation.org> 1447479674 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1447479674 -0800

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

Pull more input updates from Dmitry Torokhov:
 "An update to the tsc2005 driver that allows it to also support tsc2004
  (basically the same controller, but uses i2c instead of spi bus), and
  a couple of bug fixes"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: parkbd - drop bogus __init from parkbd_allocate_serio()
  Input: elantech - add Fujitsu Lifebook U745 to force crc_enabled
  Input: tsc2004 - add support for tsc2004
  Input: tsc200x-core - rename functions and variables
  Input: tsc2005 - separate SPI and core functions