From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 7 Mar 2011 21:14:19 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
X-Git-Tag: v2.6.38-rc8~6
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=ad4a4a82d176962ea706db555b29821af0b4dd45;p=~shefty%2Frdma-dev.git

Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6

* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
  [S390] tape: deadlock on system work queue
  [S390] keyboard: integer underflow bug
  [S390] xpram: remove __initdata attribute from module parameters
---

ad4a4a82d176962ea706db555b29821af0b4dd45