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)
commitbd19b5ab1da654de456e102250822ec06311d6ad
tree1a882bcf6f280aff6a263198782ff3e647fd5c42
parent92549cdc288f47f3a98cf80ac5890c91f5876a06
parent03c902bff524e0cf664737a33f2365f7837040bf
Merge tag 'iwlwifi-for-kalle-2017-01-23' of git://git./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