Skip to content
Commit 12f17211 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach
Browse files

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

* don't load firmware that won't exist for 7260
* fix RCU splat
parents e70d41b5 45854360
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment