From: David S. Miller <davem@davemloft.net>
Date: Mon, 25 May 2015 17:08:59 +0000 (-0400)
Subject: Merge tag 'wireless-drivers-for-davem-2015-05-25' of git://git.kernel.org/pub/scm... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c260c2f1e35621c41aaa0c7f5bddced3307f0039;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Merge tag 'wireless-drivers-for-davem-2015-05-25' of git://git./linux/kernel/git/kvalo/wireless-drivers

Kalle Valo says:

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

* fix firmware name and other things to enable 3165
* fix bad APMG configuration for 8000 (no AMPG on these devices)
* fix MAC address assignment for 8000
* fix firmware debugging triggers (MLME)
* fix several bugs in low power states code (net-detect, d0i3)

ssb:

* fix reboot after device reset for WRT350N v1
====================

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

c260c2f1e35621c41aaa0c7f5bddced3307f0039