diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-05 12:57:13 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-05 12:57:13 -0500 |
| commit | aac9e28d2f3d3c1eacc4114d685864a2a6423b80 (patch) | |
| tree | 3075a2d4c70840c3b2f7173f95c0f278072db8b7 /MAINTAINERS | |
| parent | 9f259cc59ba45b8db401d60be9700e275676fb15 (diff) | |
| parent | 3c887e8a1a4553ae6263fc9490e33de213e3746f (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
[SCSI] ibmvscsi: Prevent IO during partner login
[SCSI] lpfc : Correct queue tag handling
[SCSI] Update MAINTAINER email address and trees
[SCSI] osst: fix if (...) \n #if... cases missing semicolons when false
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 6c0e44bbf601..1c7c229a0926 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -2549,7 +2549,7 @@ S: Supported | |||
| 2549 | 2549 | ||
| 2550 | MISCELLANEOUS MCA-SUPPORT | 2550 | MISCELLANEOUS MCA-SUPPORT |
| 2551 | P: James Bottomley | 2551 | P: James Bottomley |
| 2552 | M: jejb@steeleye.com | 2552 | M: James.Bottomley@HansenPartnership.com |
| 2553 | L: linux-kernel@vger.kernel.org | 2553 | L: linux-kernel@vger.kernel.org |
| 2554 | S: Maintained | 2554 | S: Maintained |
| 2555 | 2555 | ||
| @@ -3301,9 +3301,11 @@ S: Maintained | |||
| 3301 | 3301 | ||
| 3302 | SCSI SUBSYSTEM | 3302 | SCSI SUBSYSTEM |
| 3303 | P: James E.J. Bottomley | 3303 | P: James E.J. Bottomley |
| 3304 | M: James.Bottomley@SteelEye.com | 3304 | M: James.Bottomley@HansenPartnership.com |
| 3305 | L: linux-scsi@vger.kernel.org | 3305 | L: linux-scsi@vger.kernel.org |
| 3306 | T: git kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6.git | 3306 | T: git kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6.git |
| 3307 | T: git kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6.git | ||
| 3308 | T: git kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-pending-2.6.git | ||
| 3307 | S: Maintained | 3309 | S: Maintained |
| 3308 | 3310 | ||
| 3309 | SCSI TAPE DRIVER | 3311 | SCSI TAPE DRIVER |