Merge tag 'mac80211-next-for-davem-2017-04-18' of git://git.kernel.org/pub/scm/linux...

Johannes Berg says:

====================
My last pull request has been a while, we now have:
 * connection quality monitoring with multiple thresholds
 * support for FILS shared key authentication offload
 * pre-CAC regulatory compliance - only ETSI allows this
 * sanity check for some rate confusion that hit ChromeOS
   (but nobody else uses it, evidently)
 * some documentation updates
 * lots of cleanups
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --cc drivers/net/wireless/ath/ath10k/mac.c
Simple merge

diff --cc drivers/net/wireless/ath/ath6kl/cfg80211.c
Simple merge

diff --cc drivers/net/wireless/ath/wcn36xx/main.c
Simple merge

diff --cc drivers/net/wireless/ath/wil6210/cfg80211.c
Simple merge

diff --cc drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
Simple merge

diff --cc drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
Simple merge

diff --cc drivers/net/wireless/mac80211_hwsim.c
Simple merge

diff --cc drivers/net/wireless/marvell/mwifiex/cfg80211.c
Simple merge

diff --cc drivers/net/wireless/marvell/mwifiex/main.c
Simple merge

diff --cc drivers/net/wireless/marvell/mwifiex/main.h
Simple merge

diff --cc drivers/net/wireless/marvell/mwifiex/tdls.c
Simple merge

diff --cc drivers/net/wireless/ralink/rt2x00/rt2x00dev.c
Simple merge

diff --cc drivers/net/wireless/realtek/rtl818x/rtl8187/dev.c
Simple merge

diff --cc drivers/net/wireless/rndis_wlan.c
Simple merge

diff --cc net/mac80211/iface.c
Simple merge

diff --cc net/wireless/nl80211.c
Simple merge