From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Sat, 29 Jul 2006 02:25:02 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
X-Git-Tag: v2.6.18-rc3~23
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=5d2edfe004f5d0f3d805967bd6b4ada95e6aa419;p=linux.git

Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/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
---

5d2edfe004f5d0f3d805967bd6b4ada95e6aa419