From: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Date: Tue, 20 Jan 2015 07:23:27 +0000 (+0200)
Subject: Merge remote-tracking branch 'iwlwifi-fixes/master' into iwlwifi-next
X-Git-Tag: fixes-v4.0-rc1~150^2~130^2~24^2~15
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d5234cb2f4d2bc15d088dac17d02260d2613be28;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/iwl-fw-file.h
	drivers/net/wireless/iwlwifi/mvm/scan.c
---

d5234cb2f4d2bc15d088dac17d02260d2613be28
Reading git-diff-tree failed