Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 18 Feb 2010 16:31:14 +0000 (08:31 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 18 Feb 2010 16:31:14 +0000 (08:31 -0800)
commit83c5aac175e182c30729650f2edee3294c3b8bb0
tree33a3ad885a9c74da05b25a97d9cc6b448b07861f
parent2fa298cf6d6bedf64f75644e9e8b0d64d2d83f27
parent3b77fd8ee6a8ae34e349651e9d5f5000d1cc206e
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: add KEY_RFKILL
  Input: i8042 - fix KBC jam during hibernate