diff --git a/[refs] b/[refs] index ca6958018e50..00bc67cde134 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 37448f7d39717db7c1098c1a88b9074694c69797 +refs/heads/master: 24682978eb5316b9e6041c2773e210180a037d05 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 767fb610963e..900bd58f2dbe 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -1942,6 +1942,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