| commit | cd4ca27d3dedfff09000586e4ae67771608696a0 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sat Nov 14 13:00:17 2009 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sat Nov 14 13:00:17 2009 -0800 |
| tree | 8ebf6b0b4b2e52585c4853d192c47d1866ec7ec6 | |
| parent | 0e70613b1c26bf23909d0e778de52d0cc6d88835 [diff] | |
| parent | 3d4c3aa938fcbfee1c7a6d66ee23288448fb97e7 [diff] |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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