Merge tag 'iwlwifi-for-john-2014-11-03' of git://git.kernel.org/pub/scm/linux/kernel...
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 4 Nov 2014 20:46:15 +0000 (15:46 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 4 Nov 2014 20:46:15 +0000 (15:46 -0500)
commitc00ed46d58ab69fa0e43b15b1527f80a44bffb81
tree4691fa9688e50bcc7f44a96d765c2d57ca5ff6e6
parent75a916e1944fea8347d2245c62567187e4eff9dd
parent31b8b343e019e0a0c57ca9c13520a87f9cab884b
Merge tag 'iwlwifi-for-john-2014-11-03' of git://git./linux/kernel/git/iwlwifi/iwlwifi-fixes

Emmanuel Grumbach <egrumbach@gmail.com> 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 <linville@tuxdriver.com>