Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 31 Aug 2006 21:42:07 +0000 (14:42 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 31 Aug 2006 21:42:07 +0000 (14:42 -0700)
commitdd1a47c21ee4f4f682285ad9d4624d2cec436f93
treeeb25419d0c4a3e044aa8f3d0d2ffe87c02ad0a70
parent22db37ec5fd51b0c77b1dd5751b1cdc2672c08d6
parent7b7db1b59563aebe2f4d2ba850468afb2c87c82a
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.