tree 983c5da81da5beaab1a1d859dd23b8e789005a5f
parent 7b8e2c1db0f358bc389dd1ee4633a92d80a5a6d0
parent bcc6525fb23d2cec7ffdf908d98826a66823bcb2
author Linus Torvalds <torvalds@linux-foundation.org> 1258232259 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1258232259 -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] s390: fix single stepping on svc0
  [S390] sclp: undo quiesce handler override on resume
  [S390] reset cputime accounting after IPL from NSS
  [S390] monreader: fix use after free bug with suspend/resume