Merge tag 'iwlwifi-for-kalle-2017-01-23' of git://git.kernel.org/pub/scm/linux/kernel...
authorKalle Valo <kvalo@codeaurora.org>
Tue, 24 Jan 2017 12:27:53 +0000 (14:27 +0200)
committerKalle Valo <kvalo@codeaurora.org>
Tue, 24 Jan 2017 12:27:53 +0000 (14:27 +0200)
* Remove an extra hyphen from a string that was preventing the firmware to load
* Avoid a crash when the firmware is restarted in certain scenarios with DQA


Trivial merge