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)
* '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


Trivial merge