diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-29 14:25:16 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-29 14:25:16 -0400 |
| commit | 62d3af1b5f3aa613e0a489e8d798d45b07f373f4 (patch) | |
| tree | 8f10dfd23c18600392965b69f94dd389e60827d5 /MAINTAINERS | |
| parent | 942b6f62164cf8822dd03b1569777f4663d1abd7 (diff) | |
| parent | e71180f3689e00c5a1095925352a72dacdd62e34 (diff) | |
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 | |||
| 1945 | L: netdev@vger.kernel.org | 1945 | L: netdev@vger.kernel.org |
| 1946 | S: Supported | 1946 | S: Supported |
| 1947 | 1947 | ||
| 1948 | POWERPC 4xx EMAC DRIVER | ||
| 1949 | P: Eugene Surovegin | ||
| 1950 | M: ebs@ebshome.net | ||
| 1951 | W: http://kernel.ebshome.net/emac/ | ||
| 1952 | L: linuxppc-embedded@ozlabs.org | ||
| 1953 | L: netdev@vger.kernel.org | ||
| 1954 | S: Maintained | ||
| 1955 | |||
| 1948 | PNP SUPPORT | 1956 | PNP SUPPORT |
| 1949 | P: Adam Belay | 1957 | P: Adam Belay |
| 1950 | M: ambx1@neo.rr.com | 1958 | M: ambx1@neo.rr.com |