diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-29 04:25:02 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-29 04:25:02 +0200 |
commit | 5d2edfe004f5d0f3d805967bd6b4ada95e6aa419 (patch) | |
tree | 50848e02b6e80184687083612f011565341d5f19 /arch/i386 | |
parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 (diff) | |
parent | [S390] update default configuration (diff) | |
download | linux-5d2edfe004f5d0f3d805967bd6b4ada95e6aa419.tar.xz linux-5d2edfe004f5d0f3d805967bd6b4ada95e6aa419.zip |
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
Diffstat (limited to 'arch/i386')
0 files changed, 0 insertions, 0 deletions