Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
commit5d2edfe004f5d0f3d805967bd6b4ada95e6aa419
authorLinus Torvalds <torvalds@g5.osdl.org>
Sat, 29 Jul 2006 02:25:02 +0000 (28 19:25 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sat, 29 Jul 2006 02:25:02 +0000 (28 19:25 -0700)
tree50848e02b6e80184687083612f011565341d5f19
parent9d22e6d7ad50472da399a500bf039e7718a6cdc9
parent468310a8a7af4f3933ade2700f01d493fa1a9754
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] update default configuration
  [S390] duplicate ccw devices in ccwgroup.
  [S390] permanent subchannel busy conditions may cause I/O stall