diff options
| author | Linus Torvalds | 2006-07-28 19:25:02 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2006-07-28 19:25:02 -0700 |
| commit | 5d2edfe004f5d0f3d805967bd6b4ada95e6aa419 (patch) | |
| tree | 50848e02b6e80184687083612f011565341d5f19 /arch/cris | |
| parent | 9d22e6d7ad50472da399a500bf039e7718a6cdc9 (diff) | |
| parent | 468310a8a7af4f3933ade2700f01d493fa1a9754 (diff) | |
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/cris')
0 files changed, 0 insertions, 0 deletions