diff --git a/[refs] b/[refs]
index d23e8c7153e9..cdfe35f3bbd8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4086b9cad8f7e24e3737b667a1fbd0bdb976e54a
+refs/heads/master: 6cb8755bbc72634d5df06fc54080812ee50009df
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
index 0c9bc668a36f..0fb00a2842ad 100644
--- a/trunk/MAINTAINERS
+++ b/trunk/MAINTAINERS
@@ -6178,14 +6178,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