Merge tag 'iwlwifi-for-kalle-2015-01-15' of https://git.kernel.org/pub/scm/linux...
authorKalle Valo <kvalo@codeaurora.org>
Mon, 19 Jan 2015 07:47:28 +0000 (09:47 +0200)
committerKalle Valo <kvalo@codeaurora.org>
Mon, 19 Jan 2015 07:47:28 +0000 (09:47 +0200)
* 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.


Trivial merge