From: Johannes Berg <johannes.berg@intel.com>
Date: Mon, 27 May 2013 11:30:49 +0000 (+0200)
Subject: Merge remote-tracking branch 'iwlwifi-fixes/master' into HEAD
X-Git-Tag: v5.15~19707^2~103^2^2~5^2~20
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=09e1a79ac03d643960c96314d20a904b39b89a80;p=platform%2Fkernel%2Flinux-starfive.git

Merge remote-tracking branch 'iwlwifi-fixes/master' into HEAD

Conflicts:
	drivers/net/wireless/iwlwifi/mvm/ops.c
---

09e1a79ac03d643960c96314d20a904b39b89a80
diff --cc drivers/net/wireless/iwlwifi/mvm/ops.c
index e3f69a08,b29c31a..7998bac
--- a/drivers/net/wireless/iwlwifi/mvm/ops.c
+++ b/drivers/net/wireless/iwlwifi/mvm/ops.c
@@@ -292,7 -292,7 +292,8 @@@ static const char *iwl_mvm_cmd_strings[
  	CMD(BT_COEX_PROT_ENV),
  	CMD(BT_PROFILE_NOTIFICATION),
  	CMD(BT_CONFIG),
+ 	CMD(MCAST_FILTER_CMD),
 +	CMD(REPLY_BEACON_FILTERING_CMD),
  };
  #undef CMD