Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 19 Feb 2009 16:35:52 +0000 (08:35 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 19 Feb 2009 16:35:52 +0000 (08:35 -0800)
* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
  [S390] fix "mem=" handling in case of standby memory
  [S390] Fix timeval regression on s390
  [S390] sclp: handle empty event buffers


Trivial merge