From: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Date: Sun, 20 Dec 2015 12:48:08 +0000 (+0200)
Subject: Merge tag 'iwlwifi-for-kalle-2015-12-16' into next
X-Git-Tag: v4.5-rc1~128^2~63^2~33^2~23
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=12f17211f75531139ea4394f7f7b4f2090f9778a;p=users%2Fjedix%2Flinux-maple.git

Merge tag 'iwlwifi-for-kalle-2015-12-16' into next

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

12f17211f75531139ea4394f7f7b4f2090f9778a