aboutsummaryrefslogtreecommitdiff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-02-01 13:08:59 -0800
committerDavid S. Miller <davem@davemloft.net>2011-02-01 13:08:59 -0800
commit2ba5e1feaab2762cdf45b490e3f342fedb33f57b (patch)
tree99467f62d8554957aa0938f8065d289db9d46ea5 /MAINTAINERS
parent62175c75fb11ac23fca5cd5fe0baaeb8016a6c78 (diff)
parent479600777bb588724d044815415f7d708d06644b (diff)
downloadlinux-2.6.38-lt-ux500-2ba5e1feaab2762cdf45b490e3f342fedb33f57b.tar.gz
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS6
1 files changed, 3 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 9d12977b6ba..95918417d94 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6767,12 +6767,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