]> git.karo-electronics.de Git - mv-sheeva.git/commitdiff
Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 7 Mar 2011 21:14:19 +0000 (13:14 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 7 Mar 2011 21:14:19 +0000 (13:14 -0800)
* '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


Trivial merge