summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2015-11-22 20:40:22 -0500
committerDavid S. Miller <davem@davemloft.net>2015-11-22 20:40:22 -0500
commitf96c9285487f28a90b301718aad86f047d2abb94 (patch)
tree0d490292a4ee09262cd10710314cd289498b1d67 /MAINTAINERS
parentcf869eb1118fac333b26585bce61f862d0e2b3eb (diff)
parenteeec5d0ef7ee54a75e09e861c3cc44177b8752c7 (diff)
downloadlinux-stable-f96c9285487f28a90b301718aad86f047d2abb94.tar.gz
linux-stable-f96c9285487f28a90b301718aad86f047d2abb94.tar.bz2
linux-stable-f96c9285487f28a90b301718aad86f047d2abb94.zip
Merge tag 'wireless-drivers-for-davem-2015-11-20' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers
Kalle Valo says: ==================== iwlwifi * bump API to firmware 19 - not released yet. * fix D3 flows (Luca) * new device IDs (Oren) * fix NULL pointer dereference (Avri) ath10k * fix invalid NSS for 4x4 devices * add QCA9377 hw1.0 support * fix QCA6174 regression with CE5 usage wil6210 * new maintainer - Maya Erez rtlwifi * rtl8821ae: Fix lockups on boot ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS2
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index ec0706199efb..e87b1bef6ea8 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