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

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

diff --cc drivers/net/wireless/brcm80211/brcmsmac/main.c
Simple merge

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

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

diff --cc drivers/net/wireless/rtlwifi/rtl8192ce/trx.c
Simple merge

diff --cc drivers/net/wireless/rtlwifi/rtl8192de/trx.c
Simple merge

diff --cc drivers/net/wireless/rtlwifi/rtl8192se/trx.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/sta_info.c
Simple merge

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