diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-12-06 10:37:24 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-12-06 10:37:24 -0500 |
| commit | d86804cb70f93ca5e4c0fb13402962fbfb705c53 (patch) | |
| tree | ca4e7da3541267ad909a2b73228406503e198ffa /MAINTAINERS | |
| parent | d70f2cf520cf8c86c6b467fc5dcea524ec51dc2f (diff) | |
| parent | e08fd975bf26aa8063cadd245817e042f570472d (diff) | |
| download | linux-d86804cb70f93ca5e4c0fb13402962fbfb705c53.tar.bz2 | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 4afcfb4c892b..b9ea9321adde 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1458,17 +1458,6 @@ T: git git://github.com/kvalo/ath.git S: Supported F: drivers/net/wireless/ath/ath6kl/ -ATHEROS ATH9K WIRELESS DRIVER -M: "Luis R. Rodriguez" <mcgrof@qca.qualcomm.com> -M: Jouni Malinen <jouni@qca.qualcomm.com> -M: Vasanthakumar Thiagarajan <vthiagar@qca.qualcomm.com> -M: Senthil Balasubramanian <senthilb@qca.qualcomm.com> -L: linux-wireless@vger.kernel.org -L: ath9k-devel@lists.ath9k.org -W: http://wireless.kernel.org/en/users/Drivers/ath9k -S: Supported -F: drivers/net/wireless/ath/ath9k/ - WILOCITY WIL6210 WIRELESS DRIVER M: Vladimir Kondratiev <qca_vkondrat@qca.qualcomm.com> L: linux-wireless@vger.kernel.org @@ -6928,6 +6917,14 @@ T: git git://linuxtv.org/anttip/media_tree.git S: Maintained F: drivers/media/tuners/qt1010* +QUALCOMM ATHEROS ATH9K WIRELESS DRIVER +M: QCA ath9k Development <ath9k-devel@qca.qualcomm.com> +L: linux-wireless@vger.kernel.org +L: ath9k-devel@lists.ath9k.org +W: http://wireless.kernel.org/en/users/Drivers/ath9k +S: Supported +F: drivers/net/wireless/ath/ath9k/ + QUALCOMM ATHEROS ATH10K WIRELESS DRIVER M: Kalle Valo <kvalo@qca.qualcomm.com> L: ath10k@lists.infradead.org |