]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9d22e6d 468310a)
Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Sat, 29 Jul 2006 02:25:02 +0000 (19:25 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sat, 29 Jul 2006 02:25:02 +0000 (19:25 -0700)
* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
  [S390] update default configuration
  [S390] duplicate ccw devices in ccwgroup.
  [S390] permanent subchannel busy conditions may cause I/O stall


Trivial merge
Linux 2.6 source tree