diff options
| author | David S. Miller <davem@davemloft.net> | 2011-07-22 20:01:44 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-07-22 20:01:44 -0400 |
| commit | f9035cd498486d5a82ad8ae9bcfdb91b3e57ec9d (patch) | |
| tree | f90d0fc8abc1edf7fd161252704bb5675f3460d0 /MAINTAINERS | |
| parent | 1821f7cd65ad9ea56580b830ac79bf4c4fef59cb (diff) | |
| parent | 41bf37117b47fc5ce2aae91f6a108e7e42e0b046 (diff) | |
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 | |||
| 4097 | F: drivers/net/mv643xx_eth.* | 4097 | F: drivers/net/mv643xx_eth.* |
| 4098 | F: include/linux/mv643xx.h | 4098 | F: include/linux/mv643xx.h |
| 4099 | 4099 | ||
| 4100 | MARVELL MWIFIEX WIRELESS DRIVER | ||
| 4101 | M: Bing Zhao <bzhao@marvell.com> | ||
| 4102 | L: linux-wireless@vger.kernel.org | ||
| 4103 | S: Maintained | ||
| 4104 | F: drivers/net/wireless/mwifiex/ | ||
| 4105 | |||
| 4100 | MARVELL MWL8K WIRELESS DRIVER | 4106 | MARVELL MWL8K WIRELESS DRIVER |
| 4101 | M: Lennert Buytenhek <buytenh@wantstofly.org> | 4107 | M: Lennert Buytenhek <buytenh@wantstofly.org> |
| 4102 | L: linux-wireless@vger.kernel.org | 4108 | L: linux-wireless@vger.kernel.org |
| @@ -6948,9 +6954,9 @@ S: Maintained | |||
| 6948 | F: drivers/input/misc/wistron_btns.c | 6954 | F: drivers/input/misc/wistron_btns.c |
| 6949 | 6955 | ||
| 6950 | WL1251 WIRELESS DRIVER | 6956 | WL1251 WIRELESS DRIVER |
| 6951 | M: Kalle Valo <kvalo@adurom.com> | 6957 | M: Luciano Coelho <coelho@ti.com> |
| 6952 | L: linux-wireless@vger.kernel.org | 6958 | L: linux-wireless@vger.kernel.org |
| 6953 | W: http://wireless.kernel.org | 6959 | W: http://wireless.kernel.org/en/users/Drivers/wl1251 |
| 6954 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git | 6960 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git |
| 6955 | S: Maintained | 6961 | S: Maintained |
| 6956 | F: drivers/net/wireless/wl1251/* | 6962 | F: drivers/net/wireless/wl1251/* |