]> err.no Git - linux-2.6/commitdiff
Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6 origin/HEAD origin/master
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)
* '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.


Trivial merge