From: Kalle Valo <kvalo@codeaurora.org>
Date: Wed, 7 Oct 2015 08:12:01 +0000 (+0300)
Subject: Merge tag 'iwlwifi-for-kalle-2015-10-05' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v4.3-rc7~23^2~1^2
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=de28a05ee28e36fa1fc68fcfc7c6cc1c6f7c270c;p=linux-2.6-block.git

Merge tag 'iwlwifi-for-kalle-2015-10-05' of git://git./linux/kernel/git/iwlwifi/iwlwifi-fixes

* some fixes for PN key programming when entering D3;
* fix for CSA when the AP is stopped during a channel switch;
* fix firmware name for 3160 devices;
* add some new PCI IDs for 7265 devices;
* fix CT-kill entry;
* fix kernel panic when a sysassert occurs in the init ucode flow;
---

de28a05ee28e36fa1fc68fcfc7c6cc1c6f7c270c