Merge remote-tracking branch 'wireless-next/master'

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

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

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

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

diff --cc drivers/net/wireless/ath/ath9k/hw.h
Simple merge

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

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

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

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

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

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

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