From: Kalle Valo <kvalo@codeaurora.org>
Date: Mon, 19 Jan 2015 07:47:28 +0000 (+0200)
Subject: Merge tag 'iwlwifi-for-kalle-2015-01-15' of https://git.kernel.org/pub/scm/linux... 
X-Git-Tag: drm-fsl-dcu-for-next~3900^2~25^2~1
X-Git-Url: http://git.agner.ch/gitweb/?p=linux-drm-fsl-dcu.git;a=commitdiff_plain;h=7b05520160a3252577f9a258609499b73f3bdef1

Merge tag 'iwlwifi-for-kalle-2015-01-15' of https://git./linux/kernel/git/iwlwifi/iwlwifi-fixes

* one fix for rfkill while scheduled scan is running.
  Linus's system hit this issue. WiFi would be unavailable
  after this has happpened because of bad state in cfg80211.
---

7b05520160a3252577f9a258609499b73f3bdef1