Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
commitcd4ca27d3dedfff09000586e4ae67771608696a0
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 14 Nov 2009 21:00:17 +0000 (14 13:00 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 14 Nov 2009 21:00:17 +0000 (14 13:00 -0800)
tree8ebf6b0b4b2e52585c4853d192c47d1866ec7ec6
parent0e70613b1c26bf23909d0e778de52d0cc6d88835
parent3d4c3aa938fcbfee1c7a6d66ee23288448fb97e7
Merge branch 'for-linus' of git://git./linux/kernel/git/dtor/input

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: psmouse - remove unneeded '\n' from psmouse.proto parameter
  Input: atkbd - restore LED state at reconnect
  Input: force LED reset on resume
  Input: fix locking in memoryless force-feedback devices