Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 9 Sep 2008 18:53:05 +0000 (11:53 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 9 Sep 2008 18:53:05 +0000 (11:53 -0700)
commitea81e2722e55ba0269c92f266763e445dcffb973
treea582e2dabdf77a895418ad6bfa5deee2a197b499
parent0b1fc335d2f2c1206ac4048e5f6d8971f2aae6be
parentb301ea8c81b13123761772f344faf606c76ba174
Merge branch 'for-linus' of git://git390.osdl.marist.edu/linux-2.6

* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
  [S390] cio: allow offline processing for disconnected devices
  [S390] cio: handle ssch() return codes correctly.
  [S390] cio: Correct cleanup on error.
  [S390] CVE-2008-1514: prevent ptrace padding area read/write in 31-bit mode