Merge tag 'iwlwifi-for-kalle-2016-04-12_2' of https://git.kernel.org/pub/scm/linux...
authorKalle Valo <kvalo@codeaurora.org>
Thu, 21 Apr 2016 12:40:13 +0000 (15:40 +0300)
committerKalle Valo <kvalo@codeaurora.org>
Thu, 21 Apr 2016 12:40:13 +0000 (15:40 +0300)
commite2841ea91611622370f66b4dfaa62599e8850d48
treed448a05e604ebed6919a536fe1eda8b73d8e3080
parentde478a61389cacafe94dc8b035081b681b878f9d
parentf742aaf36edf0390c54d0614bc4d20fd4cd3762a
Merge tag 'iwlwifi-for-kalle-2016-04-12_2' of https://git./linux/kernel/git/iwlwifi/iwlwifi-fixes

* add new device IDs for 8265
* fix a NULL pointer dereference when paging firmware asserts
* remove a WARNING on gscan capabilities
* fix MODULE_FIRMWARE for 8260