From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Thu, 31 Aug 2006 21:42:07 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
X-Git-Tag: v2.6.18-rc6~31
X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=dd1a47c21ee4f4f682285ad9d4624d2cec436f93;p=powerpc.git

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: unsolicited interrupts during sense pgid.
  [S390] cio: no path after machine check.
  [S390] cio: kernel stack overflow.
  [S390] dasd: fix device shutdown process.
  [S390] broken copy_in_user function.
---

dd1a47c21ee4f4f682285ad9d4624d2cec436f93