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)
commit01d85b9b2b6bec2b0773cf2afc58699dc4b052f8
treecdf5c3c1aafad46b7009f9d26bb2aa087626be01
parenteeec5d0ef7ee54a75e09e861c3cc44177b8752c7
parent4585436091cd812b1165aab71bd4847ea1cb08ec
Merge tag 'iwlwifi-for-kalle-2015-12-16' of https://git./linux/kernel/git/iwlwifi/iwlwifi-fixes

* don't load firmware that won't exist for 7260
* fix RCU splat