From: Kalle Valo <kvalo@codeaurora.org>
Date: Fri, 22 May 2015 07:47:02 +0000 (+0300)
Subject: Merge tag 'iwlwifi-for-kalle-2015-05-21' of https://git.kernel.org/pub/scm/linux... 
X-Git-Tag: v4.1-rc6~19^2~13^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aefa441b150279dd8d25658e018898a3fe9a6769;p=thirdparty%2Fkernel%2Flinux.git

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

aefa441b150279dd8d25658e018898a3fe9a6769