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

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

diff --cc drivers/net/wireless/at76c50x-usb.c
Simple merge

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

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

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

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

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

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

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

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

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

diff --cc drivers/net/wireless/ti/wl1251/main.c
Simple merge

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