]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commita723c1181fd58fa683a6157a3973f6446d370271
tree45f8da93ab0ef7b46e49bb1fd72b1b7ebbda610f
parent637831c680fc6db2aa4b10d19c16e2ee64763970
parent33e7f14afabbdafe2b03eeb8f379943f0dc9d18a
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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