]> git.baikalelectronics.ru Git - kernel.git/commit
Merge remote-tracking branch 'iwlwifi-fixes/master' into NEXT
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Sun, 14 Sep 2014 09:54:42 +0000 (12:54 +0300)
committerEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Sun, 14 Sep 2014 09:54:42 +0000 (12:54 +0300)
commit92b1122d6fd6284fdefa531756cce4fe7ebd6e0a
tree83713e5e695f04bcbdfbf69818ca03d01c4ddc45
parent4bfb47c1dada7bbe6df459df2fe4c8b95be07c41
parent65aaac166adb717a8777f7ed3ba91879acdc8fdb
Merge remote-tracking branch 'iwlwifi-fixes/master' into NEXT
14 files changed:
drivers/net/wireless/iwlwifi/Kconfig
drivers/net/wireless/iwlwifi/iwl-7000.c
drivers/net/wireless/iwlwifi/iwl-8000.c
drivers/net/wireless/iwlwifi/iwl-nvm-parse.c
drivers/net/wireless/iwlwifi/mvm/coex.c
drivers/net/wireless/iwlwifi/mvm/debugfs-vif.c
drivers/net/wireless/iwlwifi/mvm/fw-api.h
drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c
drivers/net/wireless/iwlwifi/mvm/mac80211.c
drivers/net/wireless/iwlwifi/mvm/power.c
drivers/net/wireless/iwlwifi/mvm/rx.c
drivers/net/wireless/iwlwifi/mvm/sf.c
drivers/net/wireless/iwlwifi/mvm/tx.c
drivers/net/wireless/iwlwifi/pcie/drv.c