From: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Date: Wed, 21 May 2014 09:49:38 +0000 (+0300)
Subject: Merge remote-tracking branch 'iwlwifi-fixes/master' into iwlwifi-next
X-Git-Tag: v3.16-rc1~27^2~122^2^2~16^2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0ccab3db2b3d045905e4336a407a370ae0342d49;p=thirdparty%2Fkernel%2Flinux.git

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
---

0ccab3db2b3d045905e4336a407a370ae0342d49