Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 11 Jul 2015 18:16:04 +0000 (11:16 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 11 Jul 2015 18:16:04 +0000 (11:16 -0700)
commit8a7b8ff41ddc811f3e06d0bf6892bc3e2b1764b7
treeb469c40162a0dd1bd1774ebfdd0285661c9a814a
parent4322f028477d4c84f12fa9aa21809300855ff953
parentdbf3c370862d73fcd2c74ca55e254bb02143238d
Merge branch 'for-linus' of git://git./linux/kernel/git/dtor/input

Pull input fixes from Dmitry Torokhov:
 "A fix (revert) for a recent regression in Synaptics driver and a fix
  for Elan i2c touchpad driver"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Revert "Input: synaptics - allocate 3 slots to keep stability in image sensors"
  Input: elan_i2c - change the hover event from MT to ST