diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-29 11:25:16 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-29 11:25:16 -0700 |
commit | 62d3af1b5f3aa613e0a489e8d798d45b07f373f4 (patch) | |
tree | 8f10dfd23c18600392965b69f94dd389e60827d5 /MAINTAINERS | |
parent | 942b6f62164cf8822dd03b1569777f4663d1abd7 (diff) | |
parent | e71180f3689e00c5a1095925352a72dacdd62e34 (diff) | |
download | linux-62d3af1b5f3aa613e0a489e8d798d45b07f373f4.tar.gz linux-62d3af1b5f3aa613e0a489e8d798d45b07f373f4.tar.bz2 linux-62d3af1b5f3aa613e0a489e8d798d45b07f373f4.zip |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 770155a01523..251a28e2d4cc 100644 --- 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 |