tree 41c87626e29fa8ee35cc27c324b9ec637e6efafb
parent a1342d3b8e5dbffae9d5520e2847d7d605c25266
parent 23d75d9cadd79bc9fd6553857d57c679cf18d4cb
author Linus Torvalds <torvalds@linux-foundation.org> 1235061352 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1235061352 -0800

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] fix "mem=" handling in case of standby memory
  [S390] Fix timeval regression on s390
  [S390] sclp: handle empty event buffers