Merge master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 554fcec48b3e211d22545eb31e1af914831c13ce..7e780906d34ca7daa716c4f49f6f0b8c57c4a57c 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -182,7 +182,7 @@ S:  Supported
 ACPI
 P:     Len Brown
 M:     len.brown@intel.com
-L:     acpi-devel@lists.sourceforge.net
+L:     linux-acpi@vger.kernel.org
 W:     http://acpi.sourceforge.net/
 T:     git kernel.org:/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git
 S:     Maintained
@@ -696,13 +696,6 @@ M: pc300@cyclades.com
 W:     http://www.cyclades.com/
 S:     Supported
 
-DAC960 RAID CONTROLLER DRIVER
-P:     Dave Olien
-M      dmo@osdl.org
-W:     http://www.osdl.org/archive/dmo/DAC960
-L:     linux-kernel@vger.kernel.org
-S:     Maintained
-
 DAMA SLAVE for AX.25
 P:     Joerg Reuter
 M:     jreuter@yaina.de