[MAINTAINERS]: correct location for net-2.6.git

[~andy/linux] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 6d1b048c62a105c12518f5ae1b67ec4a517d29bc..105ad85f5d60b1613352704043f2b5829905e962 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1398,7 +1398,7 @@ IRDA SUBSYSTEM
 P:     Jean Tourrilhes
 L:     irda-users@lists.sourceforge.net (subscribers-only)
 W:     http://irda.sourceforge.net/
-S:     Maintained
+S:     Odd Fixes
 
 ISAPNP
 P:     Jaroslav Kysela
@@ -1696,11 +1696,13 @@ M: mtk-manpages@gmx.net
 W: ftp://ftp.kernel.org/pub/linux/docs/manpages
 S: Maintained
 
-MARVELL MV64340 ETHERNET DRIVER
+MARVELL MV643XX ETHERNET DRIVER
+P:     Dale Farnsworth
+M:     dale@farnsworth.org
 P:     Manish Lachwani
-L:     linux-mips@linux-mips.org
+M:     mlachwani@mvista.com
 L:     netdev@vger.kernel.org
-S:     Supported
+S:     Odd Fixes for 2.4; Maintained for 2.6.
 
 MATROX FRAMEBUFFER DRIVER
 P:     Petr Vandrovec
@@ -1841,7 +1843,7 @@ M:        yoshfuji@linux-ipv6.org
 P:     Patrick McHardy
 M:     kaber@coreworks.de
 L:     netdev@vger.kernel.org
-T:     git kernel.org:/pub/scm/linux/kernel/davem/net-2.6.git
+T:     git kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git
 S:     Maintained
 
 IPVS
@@ -2534,11 +2536,11 @@ S:     Maintained
 
 TIPC NETWORK LAYER
 P:     Per Liden
-M:     per.liden@nospam.ericsson.com
+M:     per.liden@ericsson.com
 P:     Jon Maloy
-M:     jon.maloy@nospam.ericsson.com
+M:     jon.maloy@ericsson.com
 P:     Allan Stephens
-M:     allan.stephens@nospam.windriver.com
+M:     allan.stephens@windriver.com
 L:     tipc-discussion@lists.sourceforge.net
 W:     http://tipc.sourceforge.net/
 W:     http://tipc.cslab.ericsson.net/