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

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

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

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

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

diff --cc drivers/net/wireless/ipw2x00/ipw2200.c
Simple merge

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

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

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

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

diff --cc net/wireless/core.h
Simple merge

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