From: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Date: Tue, 25 Nov 2014 05:53:57 +0000 (+0200)
Subject: Merge remote-tracking branch 'iwlwifi-fixes/master' into iwlwifi-next
X-Git-Tag: omap-for-v3.19/fixes-rc1~125^2~28^2~17^2~26
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e7331845df48cd7905d0ac4452a9244446583e41;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.h
---

e7331845df48cd7905d0ac4452a9244446583e41
Reading git-diff-tree failed