From: John W. Linville Date: Tue, 4 Nov 2014 20:46:15 +0000 (-0500) Subject: Merge tag 'iwlwifi-for-john-2014-11-03' of git://git.kernel.org/pub/scm/linux/kernel... X-Git-Tag: v3.18-rc5~22^2~23^2~1 X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=c00ed46d58ab69fa0e43b15b1527f80a44bffb81 Merge tag 'iwlwifi-for-john-2014-11-03' of git://git./linux/kernel/git/iwlwifi/iwlwifi-fixes Emmanuel Grumbach says: "I fix here two issues that are related to the firmware loading flow. A user reported that he couldn't load the driver because the rfkill line was pulled up while we were running the calibrations. This was happening while booting the system: systemd was restoring the "disable wifi settings" and that raised an RFKILL interrupt during the calibration. Our driver didn't handle that properly and this is now fixed." Signed-off-by: John W. Linville --- c00ed46d58ab69fa0e43b15b1527f80a44bffb81