Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem

1 files changed, 5 insertions, 15 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 1e4eb63e2fa4..b04b97fe3217 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3671,7 +3671,7 @@ F:	include/linux/mv643xx.h
 MARVELL MWL8K WIRELESS DRIVER
 M:      Lennert Buytenhek <buytenh@wantstofly.org>
 L:      linux-wireless@vger.kernel.org
-S:      Maintained
+S:      Odd Fixes
 F:      drivers/net/wireless/mwl8k.c
 
 MARVELL SOC MMC/SD/SDIO CONTROLLER DRIVER
@@ -4522,7 +4522,7 @@ PRISM54 WIRELESS DRIVER
 M:      "Luis R. Rodriguez" <mcgrof@gmail.com>
 L:      linux-wireless@vger.kernel.org
 W:      http://prism54.org
-S:      Maintained
+S:      Obsolete
 F:      drivers/net/wireless/prism54/
 
 PROMISE DC4030 CACHING DISK CONTROLLER DRIVER
@@ -4712,9 +4712,8 @@ S:	Maintained
 F:      drivers/rapidio/
 
 RAYLINK/WEBGEAR 802.11 WIRELESS LAN DRIVER
-M:      Corey Thomas <coreythomas@charter.net>
 L:      linux-wireless@vger.kernel.org
-S:      Maintained
+S:      Orphan
 F:      drivers/net/wireless/ray*
 
 RCUTORTURE MODULE
@@ -6037,10 +6036,9 @@ F:	Documentation/video4linux/zc0301.txt
 F:      drivers/media/video/zc0301/
 
 USB ZD1201 DRIVER
-M:      Jeroen Vreeken <pe1rxq@amsat.org>
-L:      linux-usb@vger.kernel.org
+L:      linux-wireless@vger.kernel.org
 W:      http://linux-lc100020.sourceforge.net
-S:      Maintained
+S:      Orphan
 F:      drivers/net/wireless/zd1201.*
 
 USB ZR364XX DRIVER
@@ -6226,14 +6224,6 @@ F:	Documentation/watchdog/
 F:      drivers/watchdog/
 F:      include/linux/watchdog.h
 
-WAVELAN NETWORK DRIVER & WIRELESS EXTENSIONS
-M:      Jean Tourrilhes <jt@hpl.hp.com>
-L:      linux-wireless@vger.kernel.org
-W:      http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/
-S:      Maintained
-F:      Documentation/networking/wavelan.txt
-F:      drivers/staging/wavelan/
-
 WD7000 SCSI DRIVER
 M:      Miroslav Zagorac <zaga@fly.cc.fer.hr>
 L:      linux-scsi@vger.kernel.org