From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 18 Feb 2010 16:31:14 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
X-Git-Tag: v2.6.33~31
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=83c5aac175e182c30729650f2edee3294c3b8bb0;p=~shefty%2Frdma-dev.git

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: add KEY_RFKILL
  Input: i8042 - fix KBC jam during hibernate
---

83c5aac175e182c30729650f2edee3294c3b8bb0