summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-02-27 02:05:54 -0800
committerDavid S. Miller <davem@davemloft.net>2010-02-27 02:05:54 -0800
commitce300c7ffa61165f9bfd16e511ee0cd4114977ab (patch)
tree874b57409bad0c9620a431272e6bf5c94e270253 /MAINTAINERS
parent8266d7127c1b0bdf924066c19c71be4d351e9583 (diff)
parent9e3bd9190800e8209b4a3e1d724c35f0738dcad2 (diff)
downloadlinux-ce300c7ffa61165f9bfd16e511ee0cd4114977ab.tar.gz
linux-ce300c7ffa61165f9bfd16e511ee0cd4114977ab.tar.bz2
linux-ce300c7ffa61165f9bfd16e511ee0cd4114977ab.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS4
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 6bd1cd5c60df..e71ff7c67a63 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3502,9 +3502,9 @@ F: drivers/net/mv643xx_eth.*
F: include/linux/mv643xx.h
MARVELL MWL8K WIRELESS DRIVER
-M: Lennert Buytenhek <buytenh@marvell.com>
+M: Lennert Buytenhek <buytenh@wantstofly.org>
L: linux-wireless@vger.kernel.org
-S: Supported
+S: Maintained
F: drivers/net/wireless/mwl8k.c
MARVELL SOC MMC/SD/SDIO CONTROLLER DRIVER