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)
commitcd842a67e660dd3a2605557b9a64ea01cb57ba72
tree32e59dfc5d1ebe0d4b01eeb84e7a85d465b7145f
parentccd740cbc6e01b2a08baa341867063ed2887f4b9
parent38fe44e61a894f1c7b3e60b0614030271070ea53
Merge tag 'wireless-drivers-for-davem-2015-06-01' of git://git./linux/kernel/git/kvalo/wireless-drivers

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>