Merge branch 'for-linville' of git://git.kernel.org/pub/scm/linux/kernel/git/luca/wl12xx

1 files changed, 10 insertions, 17 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 6010b9d13b47..fa96459fa01f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6669,6 +6669,16 @@ L:	alsa-devel@alsa-project.org (moderated for non-subscribers)
 S:      Maintained
 F:      sound/soc/codecs/twl4030*
 
+TI WILINK WIRELESS DRIVERS
+M:      Luciano Coelho <coelho@ti.com>
+L:      linux-wireless@vger.kernel.org
+W:      http://wireless.kernel.org/en/users/Drivers/wl12xx
+W:      http://wireless.kernel.org/en/users/Drivers/wl1251
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/luca/wl12xx.git
+S:      Maintained
+F:      drivers/net/wireless/ti/
+F:      include/linux/wl12xx.h
+
 TIPC NETWORK LAYER
 M:      Jon Maloy <jon.maloy@ericsson.com>
 M:      Allan Stephens <allan.stephens@windriver.com>
@@ -7425,23 +7435,6 @@ M:	Miloslav Trmac <mitr@volny.cz>
 S:      Maintained
 F:      drivers/input/misc/wistron_btns.c
 
-WL1251 WIRELESS DRIVER
-M:      Luciano Coelho <coelho@ti.com>
-L:      linux-wireless@vger.kernel.org
-W:      http://wireless.kernel.org/en/users/Drivers/wl1251
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
-S:      Maintained
-F:      drivers/net/wireless/wl1251/*
-
-WL1271 WIRELESS DRIVER
-M:      Luciano Coelho <coelho@ti.com>
-L:      linux-wireless@vger.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/
-F:      include/linux/wl12xx.h
-
 WL3501 WIRELESS PCMCIA CARD DRIVER
 M:      Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
 L:      linux-wireless@vger.kernel.org