Merge master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 23337f88c508161976b3c782bef1511769110195..d57c491212b1bf8184272b2c172c18c51c0c09d4 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -915,6 +915,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