[PATCH] powerpc: parallel port init fix

[powerpc.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 554fcec..090e10b 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
@@ -546,13 +546,6 @@ W: http://linuxtv.org
 T:     git kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git
 S:     Maintained
 
-BUSLOGIC SCSI DRIVER
-P:     Leonard N. Zubkoff
-M:     Leonard N. Zubkoff <lnz@dandelion.com>
-L:     linux-scsi@vger.kernel.org
-W:     http://www.dandelion.com/Linux/
-S:     Maintained
-
 COMMON INTERNET FILE SYSTEM (CIFS)
 P:     Steve French
 M:     sfrench@samba.org
@@ -696,13 +689,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
@@ -818,6 +804,7 @@ S:  Maintained
 DOCBOOK FOR DOCUMENTATION
 P:     Martin Waitz
 M:     tali@admingilde.org
+T:     git http://tali.admingilde.org/git/linux-docbook.git
 S:     Maintained
 
 DOUBLETALK DRIVER
@@ -934,7 +921,6 @@ S:  Maintained
 FARSYNC SYNCHRONOUS DRIVER
 P:     Kevin Curtis
 M:     kevin.curtis@farsite.co.uk
-M:     kevin.curtis@farsite.co.uk
 W:     http://www.farsite.co.uk/
 S:     Supported
 
@@ -1705,7 +1691,6 @@ S: Maintained
 
 MARVELL MV64340 ETHERNET DRIVER
 P:     Manish Lachwani
-M:     Manish_Lachwani@pmc-sierra.com
 L:     linux-mips@linux-mips.org
 L:     netdev@vger.kernel.org
 S:     Supported
@@ -2003,6 +1988,13 @@ M:       hch@infradead.org
 L:     linux-abi-devel@lists.sourceforge.net
 S:     Maintained
 
+PCI ERROR RECOVERY
+P:     Linas Vepstas
+M:     linas@austin.ibm.com
+L:     linux-kernel@vger.kernel.org
+L:     linux-pci@atrey.karlin.mff.cuni.cz
+S:     Supported
+
 PCI SOUND DRIVERS (ES1370, ES1371 and SONICVIBES)
 P:     Thomas Sailer
 M:     sailer@ife.ee.ethz.ch