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)
commit83ff1af9d330348d1a6685b0c06d33847cd72723
tree41c87626e29fa8ee35cc27c324b9ec637e6efafb
parenta1342d3b8e5dbffae9d5520e2847d7d605c25266
parent23d75d9cadd79bc9fd6553857d57c679cf18d4cb
Merge branch 'for-linus' of git://git390.marist.edu/linux-2.6

* '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