diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-17 22:46:46 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-17 22:46:46 -0500 |
| commit | d1138cf035ad5a8dc0796b213bd078a2fb92eb7c (patch) | |
| tree | 72a4640fe87720ebfc118f2b3c7f140f5d19d6b7 /MAINTAINERS | |
| parent | 15578eeb6cd4b74492f26e60624aa1a9a52ddd7b (diff) | |
| parent | 77783a78ded96a56e3a1a0c03bbe87c56896fe6e (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, 5 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 6d1b048c62a1..ff16eac8cf5b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -1696,11 +1696,13 @@ M: mtk-manpages@gmx.net | |||
| 1696 | W: ftp://ftp.kernel.org/pub/linux/docs/manpages | 1696 | W: ftp://ftp.kernel.org/pub/linux/docs/manpages |
| 1697 | S: Maintained | 1697 | S: Maintained |
| 1698 | 1698 | ||
| 1699 | MARVELL MV64340 ETHERNET DRIVER | 1699 | MARVELL MV643XX ETHERNET DRIVER |
| 1700 | P: Dale Farnsworth | ||
| 1701 | M: dale@farnsworth.org | ||
| 1700 | P: Manish Lachwani | 1702 | P: Manish Lachwani |
| 1701 | L: linux-mips@linux-mips.org | 1703 | M: mlachwani@mvista.com |
| 1702 | L: netdev@vger.kernel.org | 1704 | L: netdev@vger.kernel.org |
| 1703 | S: Supported | 1705 | S: Odd Fixes for 2.4; Maintained for 2.6. |
| 1704 | 1706 | ||
| 1705 | MATROX FRAMEBUFFER DRIVER | 1707 | MATROX FRAMEBUFFER DRIVER |
| 1706 | P: Petr Vandrovec | 1708 | P: Petr Vandrovec |