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


Trivial merge