Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802...

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

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

diff --cc drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
index 769c134c66183071a90e6d8c694a545b2df3460f,b596ca4f22bd9b77a4777a841fa8203a87df30a0..2044fdb555581e1f78f561913f53f2b5676f60d4
--- 1/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
--- 2/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
@@@ -3506,9 -3937,11 +3506,10 @@@ brcmf_cfg80211_start_ap(struct wiphy *w
        s32 bssidx = 0;
  
        WL_TRACE("channel_type=%d, beacon_interval=%d, dtim_period=%d,\n",
-                settings->channel_type, settings->beacon_interval,
+                cfg80211_get_chandef_type(&settings->chandef),
+                settings->beacon_interval,
                 settings->dtim_period);
 -      WL_TRACE("ssid=%s(%d), auth_type=%d, inactivity_timeout=%d\n",
 +      WL_TRACE("ssid=%s(%zu), auth_type=%d, inactivity_timeout=%d\n",
                 settings->ssid, settings->ssid_len, settings->auth_type,
                 settings->inactivity_timeout);
  

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

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

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

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

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

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

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

diff --cc net/mac80211/ieee80211_i.h
Simple merge

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

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

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

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

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