projects / platform / kernel / linux-amlogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2fa298c 3b77fd8)
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)
* '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


Trivial merge
Domain: System / Kernel;