diff options
author | Jeff Garzik <jeff@garzik.org> | 2007-12-17 18:05:43 -0500 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2007-12-17 18:05:43 -0500 |
commit | 8085106a58366fb2c6c14d89e3d4395d2702d4a1 (patch) | |
tree | 9c349f8ad0d6536cfd16f046776d9c8a71c81c21 /MAINTAINERS | |
parent | 961994a0c2a24d9622eea7144b30ac773169659f (diff) | |
parent | 53e490936a91940a153e231c3b8288e3ecfcc5aa (diff) |
Merge branch 'fixes-jgarzik' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream-fixes
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 9507b4207512..c331ba391e10 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -2489,6 +2489,12 @@ M: mtk.manpages@gmail.com | |||
2489 | W: ftp://ftp.kernel.org/pub/linux/docs/manpages | 2489 | W: ftp://ftp.kernel.org/pub/linux/docs/manpages |
2490 | S: Maintained | 2490 | S: Maintained |
2491 | 2491 | ||
2492 | MARVELL LIBERTAS WIRELESS DRIVER | ||
2493 | P: Dan Williams | ||
2494 | M: dcbw@redhat.com | ||
2495 | L: libertas-dev@lists.infradead.org | ||
2496 | S: Maintained | ||
2497 | |||
2492 | MARVELL MV643XX ETHERNET DRIVER | 2498 | MARVELL MV643XX ETHERNET DRIVER |
2493 | P: Dale Farnsworth | 2499 | P: Dale Farnsworth |
2494 | M: dale@farnsworth.org | 2500 | M: dale@farnsworth.org |