Merge remote-tracking branch 'iwlwifi-fixes/master' into iwlwifi-next
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Tue, 25 Nov 2014 05:53:57 +0000 (07:53 +0200)
committerEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Tue, 25 Nov 2014 05:53:57 +0000 (07:53 +0200)
commite7331845df48cd7905d0ac4452a9244446583e41
tree92a4d61292c467674b3202bb978bc249044e47a6
parentdcad8e4299bf81f8795b44677036dfa490c9fb15
parent5ac6c72e594471acfa5b00210c51d533a73413ad
Merge remote-tracking branch 'iwlwifi-fixes/master' into iwlwifi-next

Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Conflicts:
drivers/net/wireless/iwlwifi/iwl-fw.h
drivers/net/wireless/iwlwifi/iwl-fw.h
drivers/net/wireless/iwlwifi/mvm/mac80211.c