Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 19 Sep 2008 23:24:03 +0000 (16:24 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 19 Sep 2008 23:24:03 +0000 (16:24 -0700)
commit9824b8f11373b0df806c135a342da9319ef1d893
treefb07079ecc7058e3947261aab57d1138c0a9e41c
parentab048fb1aafff7883a6bbe62b5354fbc2fa5597c
parent9adb8c1d4f0ac78b3469e377ce5f8a846cbaedaf
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: fix orb initialization in cio_start_key
  [S390] cio: Fix driver_data handling for ccwgroup devices.