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)
commit7b05520160a3252577f9a258609499b73f3bdef1
tree38cee463c0b20bcc9dc6580b4db1707d908e7c6f
parent781f51d4c2038b694a774b070dcd93ea22d10655
parent90ea15c1148bb1517e400ed14bb875e330aead2e
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.