summaryrefslogtreecommitdiff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2016-06-23 15:40:31 -0400
committerDavid S. Miller <davem@davemloft.net>2016-06-23 15:40:31 -0400
commitdc14341ed6b4e9d0a1d68c437a7ba84a621f1714 (patch)
tree2d2f853e19a86ed6212b71c07b45a8b3bdeeef5e /MAINTAINERS
parentaf7d5185263133f859dd4f35d45594deef9db854 (diff)
parent1bb57c8a5e33bcbec031ce0c629968922d5af89d (diff)
Merge tag 'wireless-drivers-next-for-davem-2016-06-21' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next
Kalle Valo says: ==================== wireless-drivers patches for 4.8 Major changes: ath10k * enable btcoex support without restarting firmware * enable ipq4019 support using AHB bus * add QCA9887 chipset support * retrieve calibration data from EEPROM, currently only for QCA9887 wil6210 * add pm_notify handling brcmfmac * add support for the PCIE devices 43525 and 43465 ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS9
1 files changed, 4 insertions, 5 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 50f69ba7499a..c9544f55496a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2578,12 +2578,11 @@ S: Supported
F: drivers/net/ethernet/broadcom/tg3.*
BROADCOM BRCM80211 IEEE802.11n WIRELESS DRIVER
-M: Brett Rudley <brudley@broadcom.com>
-M: Arend van Spriel <arend@broadcom.com>
-M: Franky (Zhenhui) Lin <frankyl@broadcom.com>
-M: Hante Meuleman <meuleman@broadcom.com>
+M: Arend van Spriel <arend.vanspriel@broadcom.com>
+M: Franky Lin <franky.lin@broadcom.com>
+M: Hante Meuleman <hante.meuleman@broadcom.com>
L: linux-wireless@vger.kernel.org
-L: brcm80211-dev-list@broadcom.com
+L: brcm80211-dev-list.pdl@broadcom.com
S: Supported
F: drivers/net/wireless/broadcom/brcm80211/