From: John W. Linville <linville@tuxdriver.com>
Date: Tue, 11 Nov 2014 21:10:19 +0000 (-0500)
Subject: Merge tag 'iwlwifi-for-john-2014-11-10' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v4.9.8~5304^2^2~11
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9d828ad7d3c791d45a2eb1c6c683bd86ba04713b;p=platform%2Fkernel%2Flinux-rpi3.git

Merge tag 'iwlwifi-for-john-2014-11-10' of git://git./linux/kernel/git/iwlwifi/iwlwifi-fixes

Emmanuel Grumbach <egrumbach@gmail.com> says:

"Two fixes here - we weren't updating mac80211 if a scan
was cut short by RFKILL which confused cfg80211. As a
result, the latter wouldn't allow to run another scan.
Liad fixes a small bug in the firmware dump."

Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

9d828ad7d3c791d45a2eb1c6c683bd86ba04713b