Merge Paulus' tree

[karo-tx-linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 9c01fd9798adf624318baf4b375f551cd87aa671..983f9e9aed617130bbd97c5bde4f11933b452049 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -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
@@ -2278,6 +2286,11 @@ W:       http://tpmdd.sourceforge.net
 L:     tpmdd-devel@lists.sourceforge.net
 S:     Maintained
 
+Telecom Clock Driver for MCPL0010
+P: Mark Gross
+M: mark.gross@intel.com
+S: Supported
+
 TENSILICA XTENSA PORT (xtensa):
 P:     Chris Zankel
 M:     chris@zankel.net