From: John W. Linville 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-Url: https://git.stricted.de/?a=commitdiff_plain;h=9d828ad7d3c791d45a2eb1c6c683bd86ba04713b;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git Merge tag 'iwlwifi-for-john-2014-11-10' of git://git./linux/kernel/git/iwlwifi/iwlwifi-fixes Emmanuel Grumbach 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 --- 9d828ad7d3c791d45a2eb1c6c683bd86ba04713b