Commits

Merge remote-tracking branch 'iwlwifi-fixes/master' into iwlwifi-next Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> Conflicts: drivers/net/wireless/iwlwifi/mvm/mac80211.c
Merge remote-tracking branch 'iwlwifi-fixes/master' into iwlwifi-next Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> Conflicts: drivers/net/wireless/iwlwifi/mvm/mac80211.c