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)
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>

Trivial merge