tree a582e2dabdf77a895418ad6bfa5deee2a197b499
parent 0b1fc335d2f2c1206ac4048e5f6d8971f2aae6be
parent b301ea8c81b13123761772f344faf606c76ba174
author Linus Torvalds <torvalds@linux-foundation.org> 1220986385 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1220986385 -0700

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