diff options
| author | Luciano Coelho <coelho@ti.com> | 2012-04-12 12:32:53 (GMT) |
|---|---|---|
| committer | Luciano Coelho <coelho@ti.com> | 2012-04-12 12:32:53 (GMT) |
| commit | 916ef361ce70a56601654e44c91855153e557051 (patch) | |
| tree | ea2812e64d17e2bf93a65e5a1933d54ff0e07255 /MAINTAINERS | |
| parent | e66a8ddff72e85605f2212a0ebc666c7e9116641 (diff) | |
| parent | 6bac40a63aae9d0942496c9f350dbb7a6c88e3fa (diff) | |
| download | linux-fsl-qoriq-916ef361ce70a56601654e44c91855153e557051.tar.xz | |
Merge branch 'wl12xx-next' into for-linville
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 27 |
1 files changed, 10 insertions, 17 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 3adbbb2..073a7b8 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -6660,6 +6660,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> @@ -7416,23 +7426,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 |