From: Kalle Valo <kvalo@codeaurora.org>
Date: Tue, 24 Jan 2017 12:27:53 +0000 (+0200)
Subject: Merge tag 'iwlwifi-for-kalle-2017-01-23' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v4.10-rc7~24^2~12^2~1
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=bd19b5ab1da654de456e102250822ec06311d6ad;p=linux.git

Merge tag 'iwlwifi-for-kalle-2017-01-23' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes

* 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
---

bd19b5ab1da654de456e102250822ec06311d6ad