Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 30 Apr 2012 17:13:48 +0000 (10:13 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 30 Apr 2012 17:13:48 +0000 (10:13 -0700)
Pull input fix from Dmitry Torokhov:
 "A simple fix for a recent regression in Synaptics driver"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: synaptics - fix regression with "image sensor" trackpads


Trivial merge