Merge branch 'master'

[linux-2.6-omap-h63xx.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 983f9e9aed617130bbd97c5bde4f11933b452049..f08a1434b2178c91be2b29c8180607fdd6ddfbda 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -910,6 +910,15 @@ L: linux-fbdev-devel@lists.sourceforge.net
 W:     http://linux-fbdev.sourceforge.net/
 S:     Maintained
 
+FREESCALE SOC FS_ENET DRIVER
+P:     Pantelis Antoniou
+M:     pantelis.antoniou@gmail.com
+P:     Vitaly Bordug
+M:     vbordug@ru.mvista.com
+L:     linuxppc-embedded@ozlabs.org
+L:     netdev@vger.kernel.org
+S:     Maintained
+
 FILE LOCKING (flock() and fcntl()/lockf())
 P:     Matthew Wilcox
 M:     matthew@wil.cx