From: David S. Miller <davem@davemloft.net>
Date: Mon, 1 Jun 2015 23:06:29 +0000 (-0700)
Subject: Merge tag 'wireless-drivers-for-davem-2015-06-01' of git://git.kernel.org/pub/scm... 
X-Git-Tag: firefly_0821_release~176^2~1698^2~1
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=cd842a67e660dd3a2605557b9a64ea01cb57ba72;p=firefly-linux-kernel-4.4.55.git

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

cd842a67e660dd3a2605557b9a64ea01cb57ba72