Merge tag 'iwlwifi-for-kalle-2015-12-16' into next
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Sun, 20 Dec 2015 12:48:08 +0000 (14:48 +0200)
committerEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Sun, 20 Dec 2015 12:48:08 +0000 (14:48 +0200)
commit12f17211f75531139ea4394f7f7b4f2090f9778a
tree31d2614a4c2cfc72a321283ee245f70a2a4bf2b5
parente70d41b59f30d2f26f505890d9a893e924b359bf
parent4585436091cd812b1165aab71bd4847ea1cb08ec
Merge tag 'iwlwifi-for-kalle-2015-12-16' into next

* don't load firmware that won't exist for 7260
* fix RCU splat
drivers/net/wireless/intel/iwlwifi/iwl-7000.c
drivers/net/wireless/intel/iwlwifi/mvm/sta.c