diff --git a/[refs] b/[refs]
index adc709ca29c2..098f5e6245d3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 038d925bcfed8df4d16bab57c2b5a4de6ede7847
+refs/heads/master: 2354b9fdda6491c8476498b246ff7c48d324a07f
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
index 1af022e63668..4a953a5fd666 100644
--- a/trunk/MAINTAINERS
+++ b/trunk/MAINTAINERS
@@ -6742,12 +6742,12 @@ S:	Maintained
 F:	drivers/net/wireless/wl1251/*
 
 WL1271 WIRELESS DRIVER
-M:	Luciano Coelho <luciano.coelho@nokia.com>
+M:	Luciano Coelho <coelho@ti.com>
 L:	linux-wireless@vger.kernel.org
-W:	http://wireless.kernel.org
+W:	http://wireless.kernel.org/en/users/Drivers/wl12xx
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/luca/wl12xx.git
 S:	Maintained
-F:	drivers/net/wireless/wl12xx/wl1271*
+F:	drivers/net/wireless/wl12xx/
 F:	include/linux/wl12xx.h
 
 WL3501 WIRELESS PCMCIA CARD DRIVER