diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-07-22 17:51:16 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-07-22 17:51:16 -0400 |
| commit | 41bf37117b47fc5ce2aae91f6a108e7e42e0b046 (patch) | |
| tree | d5c8f24075313edfe548256dd931527f1569921e /MAINTAINERS | |
| parent | 415b3334a21aa67806c52d1acf4e72e14f7f402f (diff) | |
| parent | 6e6e8c510a84fe3237ef02b954e58cca6a3f4b1a (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 7a9569e06b0a..380d2d5f08c9 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4097,6 +4097,12 @@ S: Maintained F: drivers/net/mv643xx_eth.* F: include/linux/mv643xx.h +MARVELL MWIFIEX WIRELESS DRIVER +M: Bing Zhao <bzhao@marvell.com> +L: linux-wireless@vger.kernel.org +S: Maintained +F: drivers/net/wireless/mwifiex/ + MARVELL MWL8K WIRELESS DRIVER M: Lennert Buytenhek <buytenh@wantstofly.org> L: linux-wireless@vger.kernel.org @@ -6938,9 +6944,9 @@ S: Maintained F: drivers/input/misc/wistron_btns.c WL1251 WIRELESS DRIVER -M: Kalle Valo <kvalo@adurom.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/wl1251 T: git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git S: Maintained F: drivers/net/wireless/wl1251/* |