diff options
| author | David S. Miller <davem@davemloft.net> | 2011-07-23 02:01:44 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-07-23 02:01:44 +0200 |
| commit | f9035cd498486d5a82ad8ae9bcfdb91b3e57ec9d (patch) | |
| tree | f90d0fc8abc1edf7fd161252704bb5675f3460d0 /MAINTAINERS | |
| parent | net: allow netif_carrier to be called safely from IRQ (diff) | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil... (diff) | |
| download | linux-f9035cd498486d5a82ad8ae9bcfdb91b3e57ec9d.tar.xz linux-f9035cd498486d5a82ad8ae9bcfdb91b3e57ec9d.zip | |
Merge branch 'for-davem' of ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 41ec646d8a98..a116b35c9a1e 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 @@ -6948,9 +6954,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/* |