From: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Date: Tue, 22 Jul 2014 16:26:41 +0000 (+0300)
Subject: Merge branch 'iwlwifi-fixes' into iwlwifi-next
X-Git-Tag: omap-for-v3.17/fixes-against-rc2~149^2~73^2~7^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=917d083d48f50537b21c8761e2366bf229ed9f5d;p=pandora-kernel.git

Merge branch 'iwlwifi-fixes' into iwlwifi-next

Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>

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

917d083d48f50537b21c8761e2366bf229ed9f5d
Reading git-diff-tree failed