diff options
| author | Kalle Valo <kvalo@codeaurora.org> | 2015-11-17 15:56:52 +0200 |
|---|---|---|
| committer | Kalle Valo <kvalo@codeaurora.org> | 2015-11-17 15:56:52 +0200 |
| commit | cecd4cfb540ed627fba81a0c4d92e205ed8314e6 (patch) | |
| tree | 8fab518fea6db966404c7784d0666817252c10b0 /MAINTAINERS | |
| parent | 948cca9fc3052be86d937bcb74170215b38117e8 (diff) | |
| parent | 6419fdbb6f90e147690f8833cba59d289d613da5 (diff) | |
| download | linux-cecd4cfb540ed627fba81a0c4d92e205ed8314e6.tar.gz linux-cecd4cfb540ed627fba81a0c4d92e205ed8314e6.tar.bz2 linux-cecd4cfb540ed627fba81a0c4d92e205ed8314e6.zip | |
Merge ath-current from ath.git
ath10k
* fix invalid NSS for 4x4 devices
* add QCA9377 hw1.0 support
* fix QCA6174 regression with CE5 usage
wil6210
* new maintainer - Maya Erez
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 45320675a460..c5bee001fbdc 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1847,7 +1847,7 @@ S: Supported F: drivers/net/wireless/ath/ath6kl/ WILOCITY WIL6210 WIRELESS DRIVER -M: Vladimir Kondratiev <qca_vkondrat@qca.qualcomm.com> +M: Maya Erez <qca_merez@qca.qualcomm.com> L: linux-wireless@vger.kernel.org L: wil6210@qca.qualcomm.com S: Supported |