Merge tag 'wireless-drivers-for-davem-2015-12-28' of git://git.kernel.org/pub/scm...
authorDavid S. Miller <davem@davemloft.net>
Wed, 30 Dec 2015 21:42:31 +0000 (16:42 -0500)
committerDavid S. Miller <davem@davemloft.net>
Wed, 30 Dec 2015 21:42:31 +0000 (16:42 -0500)
commita0ccc3f27704c24bb60746c11092690fffa5f89e
tree149d655474fb2344a0226dcab88e3df7900f587b
parent574aab1e02837927e3c94193eedf94128ad10b6d
parent01d85b9b2b6bec2b0773cf2afc58699dc4b052f8
Merge tag 'wireless-drivers-for-davem-2015-12-28' of git://git./linux/kernel/git/kvalo/wireless-drivers

Kalle Valo says:

====================
iwlwifi

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

Signed-off-by: David S. Miller <davem@davemloft.net>