commit da1ba891f22835db9a2c349315c3763e9f4e4e67
author Linus Torvalds <torvalds@linux-foundation.org> Thu May 08 10:47:39 2008 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Thu May 08 10:47:39 2008 -0700
tree 958c53bfbe540c14370709d64c538e5c3f6cff2b
parent 8b2cc917a02936c3ea7d8da46801c7b7b6233093
parent 45e576b1c3d0020607b8666c0247164e92c7d719

Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6

* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
  [S390] guest page hinting light
  [S390] tty3270: fix put_char fail/success conversion.
  [S390] compat ptrace cleanup
  [S390] s390mach compile warning
  [S390] cio: Fix parsing mechanism for blacklisted devices.
  [S390] cio: Remove cio_msg kernel parameter.
  [S390] s390-kvm: leave sie context on work. Removes preemption requirement
  [S390] s390: Optimize user and work TIF check