diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-09-19 15:00:16 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-09-19 15:00:16 -0400 |
| commit | b53d63ecce17c4ddf8636def9f6e8b865c3927f9 (patch) | |
| tree | 683ef774fcfb423fa35f61e4326d0ce3f6a7c283 /MAINTAINERS | |
| parent | 765cf9976e937f1cfe9159bf4534967c8bf8eb6d (diff) | |
| parent | 12e62d6f7ec475e546b40bece2045da15d6c21ef (diff) | |
Merge branch 'master' of ssh://infradead/~/public_git/wireless-next into for-davem
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 579713ef7cf..3891a12eb6a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1246,6 +1246,14 @@ W: http://wireless.kernel.org/en/users/Drivers/ath5k S: Maintained F: drivers/net/wireless/ath/ath5k/ +ATHEROS ATH6KL WIRELESS DRIVER +M: Kalle Valo <kvalo@qca.qualcomm.com> +L: linux-wireless@vger.kernel.org +W: http://wireless.kernel.org/en/users/Drivers/ath6kl +T: git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath6kl.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> @@ -6145,12 +6153,6 @@ M: Jakub Schmidtke <sjakub@gmail.com> S: Odd Fixes F: drivers/staging/asus_oled/ -STAGING - ATHEROS ATH6KL WIRELESS DRIVER -M: Luis R. Rodriguez <mcgrof@gmail.com> -M: Naveen Singh <nsingh@atheros.com> -S: Odd Fixes -F: drivers/staging/ath6kl/ - STAGING - COMEDI M: Ian Abbott <abbotti@mev.co.uk> M: Mori Hess <fmhess@users.sourceforge.net> |