Merge tag 'wireless-drivers-for-davem-2015-06-01' of git://git.kernel.org/pub/scm...
authorDavid S. Miller <davem@davemloft.net>
Mon, 1 Jun 2015 23:06:29 +0000 (16:06 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 1 Jun 2015 23:06:29 +0000 (16:06 -0700)
Kalle Valo says:

====================
iwlwifi:

* fix OTP parsing 8260
* fix powersave handling for 8260

brcmfmac:

* fix null pointer crash
====================

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

Trivial merge