Merge tag 'iwlwifi-for-kalle-2015-05-21' of https://git.kernel.org/pub/scm/linux...
authorKalle Valo <kvalo@codeaurora.org>
Fri, 22 May 2015 07:47:02 +0000 (10:47 +0300)
committerKalle Valo <kvalo@codeaurora.org>
Fri, 22 May 2015 07:47:02 +0000 (10:47 +0300)
commitaefa441b150279dd8d25658e018898a3fe9a6769
tree77e18517199fe6ae69a28154d24326c53abcf41c
parentc411ead995b46f361b92116fd042ae83866044a1
parent292208914d8ca5a41cf68c2f1d2810a2ea2044e9
Merge tag 'iwlwifi-for-kalle-2015-05-21' of https://git./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)