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)
commit71511c866bce04f931e462ad0cce3f122aa0c447
tree83713e5e695f04bcbdfbf69818ca03d01c4ddc45
parent712b24adc105518f7cbbb6f9f353efea48954bb9
parent2cddddc56a1179aa71b460ad616176c237d4a243
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