From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 8 May 2008 17:47:39 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
X-Git-Tag: v2.6.26-rc2~35
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=da1ba891f22835db9a2c349315c3763e9f4e4e67;p=linux-2.6-omap-h63xx.git

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

da1ba891f22835db9a2c349315c3763e9f4e4e67