Merge commit '4e6ce4dc7ce71d0886908d55129d5d6482a27ff9' of git://git.kernel.org/pub...
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 19 Nov 2014 20:38:48 +0000 (15:38 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 19 Nov 2014 20:38:48 +0000 (15:38 -0500)
commitab1f5a532c9d33b49b039660c5ecbc0ab53e7133
treea1c1d820f2280535978632c5935462efcf5a4c7f
parentf48ecb19bc0443a4272dd0934e7bee4480610df9
parent4e6ce4dc7ce71d0886908d55129d5d6482a27ff9
Merge commit '4e6ce4dc7ce71d0886908d55129d5d6482a27ff9' of git://git./linux/kernel/git/linville/wireless
22 files changed:
drivers/bcma/main.c
drivers/net/wireless/ath/ath.h
drivers/net/wireless/ath/ath9k/ar9003_phy.c
drivers/net/wireless/ath/ath9k/common.c
drivers/net/wireless/ath/ath9k/debug.c
drivers/net/wireless/ath/ath9k/hw.c
drivers/net/wireless/ath/ath9k/init.c
drivers/net/wireless/ath/ath9k/main.c
drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c
drivers/net/wireless/brcm80211/brcmfmac/sdio.c
drivers/net/wireless/iwlwifi/mvm/mac80211.c
drivers/net/wireless/iwlwifi/mvm/mvm.h
drivers/net/wireless/iwlwifi/mvm/ops.c
drivers/net/wireless/iwlwifi/mvm/scan.c
drivers/net/wireless/iwlwifi/pcie/trans.c
drivers/net/wireless/mac80211_hwsim.c
drivers/net/wireless/mwifiex/main.h
drivers/net/wireless/rtlwifi/rtl8821ae/phy.c
net/mac80211/ieee80211_i.h
net/mac80211/iface.c
net/mac80211/mlme.c
net/mac80211/rx.c