Merge wireless into wireless-next

There are some changes coming to wireless-next that will
otherwise cause conflicts, pull wireless in first to be
able to resolve that when applying the individual changes
rather than having to do merge resolution later.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

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

diff --cc drivers/net/wireless/intel/iwlwifi/fw/api/debug.h
Simple merge

diff --cc drivers/net/wireless/intel/iwlwifi/fw/dbg.c
Simple merge

diff --cc drivers/net/wireless/intel/iwlwifi/iwl-drv.c
Simple merge

diff --cc drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
Simple merge

diff --cc drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
Simple merge

diff --cc drivers/net/wireless/intel/iwlwifi/mvm/mld-mac80211.c
Simple merge

diff --cc drivers/net/wireless/microchip/wilc1000/netdev.c
Simple merge

diff --cc drivers/net/wireless/microchip/wilc1000/spi.c
Simple merge

diff --cc drivers/net/wireless/ti/wlcore/sdio.c
Simple merge

diff --cc include/net/cfg80211.h
Simple merge

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

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

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

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

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