summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2007-12-17 18:05:43 -0500
committerJeff Garzik <jeff@garzik.org>2007-12-17 18:05:43 -0500
commit8085106a58366fb2c6c14d89e3d4395d2702d4a1 (patch)
tree9c349f8ad0d6536cfd16f046776d9c8a71c81c21 /MAINTAINERS
parent961994a0c2a24d9622eea7144b30ac773169659f (diff)
parent53e490936a91940a153e231c3b8288e3ecfcc5aa (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--MAINTAINERS6
1 files changed, 6 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 9507b420751..c331ba391e1 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2489,6 +2489,12 @@ M: mtk.manpages@gmail.com
W: ftp://ftp.kernel.org/pub/linux/docs/manpages
S: Maintained
+MARVELL LIBERTAS WIRELESS DRIVER
+P: Dan Williams
+M: dcbw@redhat.com
+L: libertas-dev@lists.infradead.org
+S: Maintained
+
MARVELL MV643XX ETHERNET DRIVER
P: Dale Farnsworth
M: dale@farnsworth.org