Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless

drivers/net/wireless/ath/ath9k/main.c

drivers/net/wireless/brcm80211/brcmfmac/of.c

drivers/net/wireless/brcm80211/brcmfmac/pcie.c

drivers/net/wireless/brcm80211/brcmfmac/usb.c

drivers/net/wireless/rtlwifi/pci.c

drivers/net/wireless/rtlwifi/rtl8192ce/hw.c

drivers/net/wireless/rtlwifi/rtl8192ce/sw.c

drivers/net/wireless/rtlwifi/rtl8192ce/trx.c

drivers/net/wireless/rtlwifi/rtl8192ce/trx.h

drivers/net/wireless/rtlwifi/rtl8821ae/hw.c

net/mac80211/rc80211_minstrel_ht.c