Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 6 Jun 2015 16:08:23 +0000 (09:08 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 6 Jun 2015 16:08:23 +0000 (09:08 -0700)
commitf46c5818b1570f58b1b7dc69e49060a6b9a1ac94
tree6ce7ad7ef4b05baafab8028077dabf8e573a9322
parent77493bd9b2c9b1e07c2d9ccc481ed4dfc7ef2d1c
parent088df2ccef75754cc16a6ba31829d23bcb2b68ed
Merge branch 'for-linus' of git://git./linux/kernel/git/dtor/input

Pull input subsystem fixes from Dmitry Torokhov:
 "Just a couple touchpad drivers fixups"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: alps - do not reduce trackpoint speed by half
  Input: elantech - add new icbody type
  Input: elantech - fix detection of touchpads where the revision matches a known rate