Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 23 Feb 2011 22:44:25 +0000 (14:44 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 23 Feb 2011 22:44:25 +0000 (14:44 -0800)
commit57949e8006de9643ac95447143e0211be3ff5f81
tree2005f08ad1abcdc7268b93815e763017cfd25962
parent13d1ea9a20ed7d77f98c1622dcf9f3881649f6d7
parent1d64b655dc083df5c5ac39945ccbbc6532903bf1
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: serio/gameport - use 'long' system workqueue
  Input: synaptics - document 0x0c query
  Input: tegra-kbc - add function keymap
drivers/input/gameport/gameport.c