tree 50848e02b6e80184687083612f011565341d5f19
parent 9d22e6d7ad50472da399a500bf039e7718a6cdc9
parent 468310a8a7af4f3933ade2700f01d493fa1a9754
author Linus Torvalds <torvalds@g5.osdl.org> 1154139902 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> 1154139902 -0700

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