tag e58df335e0066d3e80526c4ccf7b465ce59ec6a6
tagger Kalle Valo <kvalo@codeaurora.org> Mon May 25 14:48:52 2015 +0300
object aefa441b150279dd8d25658e018898a3fe9a6769

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

commit aefa441b150279dd8d25658e018898a3fe9a6769
author Kalle Valo <kvalo@codeaurora.org> Fri May 22 10:47:02 2015 +0300
committer Kalle Valo <kvalo@codeaurora.org> Fri May 22 10:47:02 2015 +0300
tree 77e18517199fe6ae69a28154d24326c53abcf41c
parent c411ead995b46f361b92116fd042ae83866044a1
parent 292208914d8ca5a41cf68c2f1d2810a2ea2044e9

Merge tag 'iwlwifi-for-kalle-2015-05-21' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes

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