Merge tag 'wireless-drivers-next-for-davem-2015-04-09' of git://git.kernel.org/pub...
authorDavid S. Miller <davem@davemloft.net>
Thu, 9 Apr 2015 18:43:13 +0000 (14:43 -0400)
committerDavid S. Miller <davem@davemloft.net>
Thu, 9 Apr 2015 18:43:13 +0000 (14:43 -0400)
Kalle Valo says:

====================
Major changes:

iwlwifi:

* some more work on LAR
* fixes for UMAC scan
* more work on debugging framework
* more work for 8000 devices
* cleanups and small bugfixes
====================

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

Trivial merge