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

[mv-sheeva.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 2868b28797557ef0eb2e732afe83b2251b23c53b..e88d193d42f8f7031b86900cb215806753991b52 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1643,7 +1643,7 @@ S:        Maintained
 MIPS
 P:     Ralf Baechle
 M:     ralf@linux-mips.org
-W:     http://oss.sgi.com/mips/mips-howto.html
+W:     http://www.linux-mips.org/
 L:     linux-mips@linux-mips.org
 S:     Maintained
 
@@ -1945,6 +1945,14 @@ M:       george@mvista.com
 L:     netdev@vger.kernel.org
 S:     Supported
 
+POWERPC 4xx EMAC DRIVER
+P:     Eugene Surovegin
+M:     ebs@ebshome.net
+W:     http://kernel.ebshome.net/emac/
+L:     linuxppc-embedded@ozlabs.org
+L:     netdev@vger.kernel.org
+S:     Maintained
+
 PNP SUPPORT
 P:     Adam Belay
 M:     ambx1@neo.rr.com
@@ -2489,14 +2497,6 @@ L:       linux-kernel@vger.kernel.org
 L:     linux-usb-devel@lists.sourceforge.net
 S:     Supported
 
-USB BLUETOOTH TTY CONVERTER DRIVER
-P:     Greg Kroah-Hartman
-M:     greg@kroah.com
-L:     linux-usb-users@lists.sourceforge.net
-L:     linux-usb-devel@lists.sourceforge.net
-S:     Maintained
-W:     http://www.kroah.com/linux-usb/
-
 USB CDC ETHERNET DRIVER
 P:     Greg Kroah-Hartman
 M:     greg@kroah.com