aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2004-05-10 02:10:46 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2004-05-10 02:10:46 -0700
commit1ce351789ad5ea21ff9a9d451cc3b3e292cce425 (patch)
tree65ffd44fbc3a4f6eb6138e16d174bc00d2d985e0 /MAINTAINERS
parentc8c391f74a7375e88dc29083d7ba994a727a87cc (diff)
parent50f61b559714162907ab34467efefb1884385300 (diff)
downloadhistory-1ce351789ad5ea21ff9a9d451cc3b3e292cce425.tar.gz
Merge bk://linux-scsi.bkbits.net/scsi-for-linus-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS11
1 files changed, 7 insertions, 4 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index d93708410970f4..9aa4404523e8c6 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -168,10 +168,8 @@ S: Supported
AACRAID SCSI RAID DRIVER
P: Adaptec OEM Raid Solutions
-M: linux-aacraid-devel@dell.com
-L: linux-aacraid-devel@dell.com
-L: linux-aacraid-announce@dell.com
-W: http://domsch.com/linux
+L: linux-scsi@vger.kernel.org
+W: http://linux.dell.com/storage.shtml
S: Supported
ACPI
@@ -974,6 +972,11 @@ M: langa2@kph.uni-mainz.de
W: http://www.uni-mainz.de/~langm000/linux.html
S: Maintained
+IBM Power Linux RAID adapter
+P: Brian King
+M: brking@us.ibm.com
+S: Supported
+
IBM ServeRAID RAID DRIVER
P: Jack Hammer
P: Dave Jeffery