diff --git a/[refs] b/[refs]
index 038e47859de6..34a0e61e3534 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: da81dede95cf69b0e51442cb472f1581583381e4
+refs/heads/master: 96dd603f3817c5289a906539cb85bddae9536868
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
index ecfcc24113c5..2951b8027a03 100644
--- a/trunk/MAINTAINERS
+++ b/trunk/MAINTAINERS
@@ -3609,13 +3609,11 @@ W:	http://www.linux-ax25.org/
 S:	Maintained
 
 RTL818X WIRELESS DRIVER
-P:	Michael Wu
-M:	flamingice@sourmilk.net
-P:	Andrea Merello
-M:	andreamrl@tiscali.it
+P:	John W. Linville
+M:	linville@tuxdriver.com
 L:	linux-wireless@vger.kernel.org
 W:	http://linuxwireless.org/
-T:	git kernel.org:/pub/scm/linux/kernel/git/mwu/mac80211-drivers.git
+T:	git kernel.org:/pub/scm/linux/kernel/git/linville/wireless-testing.git
 S:	Maintained
 
 S3 SAVAGE FRAMEBUFFER DRIVER