Merge tag 'wireless-drivers-for-davem-2015-05-25' of git://git.kernel.org/pub/scm...
authorDavid S. Miller <davem@davemloft.net>
Mon, 25 May 2015 17:08:59 +0000 (13:08 -0400)
committerDavid S. Miller <davem@davemloft.net>
Mon, 25 May 2015 17:08:59 +0000 (13:08 -0400)
commitc260c2f1e35621c41aaa0c7f5bddced3307f0039
tree7958b602038e27e38bc760a575c21bed04c64f57
parent3f7352bf21f8fd7ba3e2fcef9488756f188e12be
parentaefa441b150279dd8d25658e018898a3fe9a6769
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>