Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
[linux-2.6.git] / MAINTAINERS
index 770155a..251a28e 100644 (file)
@@ -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