Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

diff --combined MAINTAINERS
index 251a28e2d4ccb5df98f2d9dfed3c6efa21c68a1a,9c01fd9798adf624318baf4b375f551cd87aa671..e88d193d42f8f7031b86900cb215806753991b52
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1643,7 -1643,7 +1643,7 @@@ S:      Maintaine
  MIPS
  P:    Ralf Baechle
  M:    ralf@linux-mips.org
- W:    http://oss.sgi.com/mips/mips-howto.html
+ W:    http://www.linux-mips.org/
  L:    linux-mips@linux-mips.org
  S:    Maintained
  
@@@ -1945,14 -1945,6 +1945,14 @@@ M:    george@mvista.co
  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