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


Trivial merge