From: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Date: Tue, 26 May 2015 16:20:34 +0000 (+0300)
Subject: Merge remote-tracking branch 'iwlwifi-fixes/master' into iwlwifi-next
X-Git-Tag: omap-for-v4.2/fixes-rc1^2~134^2~139^2^2~53
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=04c9599d1a4cdd91b4c0bded3b12cc8203b68a2c;p=pandora-kernel.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/Kconfig
---

04c9599d1a4cdd91b4c0bded3b12cc8203b68a2c
Reading git-diff-tree failed