Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

[sfrench/cifs-2.6.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index bce7123d49d977490c6a9371cc7063dd4cc635b0..270e28c0506aa4dba9af46c57f853a9ddea4c92c 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
@@ -927,7 +927,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
 
@@ -1698,7 +1697,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