]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 13 Feb 2014 19:43:02 +0000 (14:43 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 13 Feb 2014 19:43:02 +0000 (14:43 -0500)
commitcc0f83c9bf968cad668c5e1061a24b17187c2519
treee9e1348372b413e6b1b503209582b03c9005f614
parent053642e5df819c98ac483ab3ff14a491a5dfacc3
parentaaa080391879daa39ac3ee102711fa28b5d95789
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
22 files changed:
drivers/net/wireless/ath/ath9k/htc.h
drivers/net/wireless/ath/ath9k/htc_drv_init.c
drivers/net/wireless/ath/ath9k/htc_drv_main.c
drivers/net/wireless/ath/ath9k/hw.c
drivers/net/wireless/ath/ath9k/init.c
drivers/net/wireless/iwlwifi/iwl-nvm-parse.c
drivers/net/wireless/iwlwifi/mvm/mac80211.c
drivers/net/wireless/iwlwifi/mvm/scan.c
drivers/net/wireless/iwlwifi/mvm/sta.c
drivers/net/wireless/iwlwifi/mvm/tx.c
drivers/net/wireless/iwlwifi/mvm/utils.c
drivers/net/wireless/iwlwifi/pcie/drv.c
drivers/net/wireless/rtl818x/rtl8180/dev.c
net/mac80211/cfg.c
net/mac80211/ht.c
net/mac80211/ibss.c
net/mac80211/iface.c
net/mac80211/tx.c
net/wireless/core.c
net/wireless/core.h
net/wireless/nl80211.c
net/wireless/nl80211.h