Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 28 Nov 2014 01:51:50 +0000 (17:51 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 28 Nov 2014 01:51:50 +0000 (17:51 -0800)
commit0210bb6083e655981ebe9ea2fc6a4ab4e96d4bff
tree45f8da93ab0ef7b46e49bb1fd72b1b7ebbda610f
parent3314bf6ba2ac8f1a2dd0d55a980835a258f1a45d
parenta1f9a4072655843fc03186acbad65990cc05dd2d
Merge branch 'for-linus' of git://git./linux/kernel/git/dtor/input

Pull input layer fixes from Dmitry Torokhov:
 "The main change is to fix breakage in Elantech driver introduced by
  the recent commit adding trackpoint reporting to protocol v4.  Now we
  are trusting the hardware to advertise the trackpoint properly and do
  not try to decode the data as trackpoint if firmware told us it is not
  present"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: xpad - use proper endpoint type
  Input: elantech - trust firmware about trackpoint presence
  Input: synaptics - adjust min/max on Thinkpad E540