Merge tag 'iwlwifi-for-kalle-2015-12-16' of https://git.kernel.org/pub/scm/linux...
authorKalle Valo <kvalo@codeaurora.org>
Fri, 18 Dec 2015 12:57:02 +0000 (14:57 +0200)
committerKalle Valo <kvalo@codeaurora.org>
Fri, 18 Dec 2015 12:57:02 +0000 (14:57 +0200)
* don't load firmware that won't exist for 7260
* fix RCU splat


Trivial merge