From: David S. Miller <davem@davemloft.net>
Date: Mon, 19 Oct 2015 06:05:56 +0000 (-0700)
Subject: Merge tag 'wireless-drivers-for-davem-2015-10-17' of git://git.kernel.org/pub/scm... 
X-Git-Tag: drm-fsl-dcu-for-next~2347^2~1
X-Git-Url: http://git.agner.ch/gitweb/?p=linux-drm-fsl-dcu.git;a=commitdiff_plain;h=afc050dd8e3387f71def1d6114ecd589f16874df

Merge tag 'wireless-drivers-for-davem-2015-10-17' of git://git./linux/kernel/git/kvalo/wireless-drivers

Kalle Valo says:

====================
iwlwifi:

* mvm: flush fw_dump_wk when mvm fails to start
* mvm: init card correctly on ctkill exit check
* pci: add a few more PCI subvendor IDs for the 7265 series
* fix firmware filename for 3160
* mvm: clear csa countdown when AP is stopped
* mvm: fix D3 firmware PN programming
* dvm: fix D3 firmware PN programming
* mvm: fix D3 CCMP TX PN assignment

rtlwifi:

* rtl8821ae: Fix system lockups on boot
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
---

afc050dd8e3387f71def1d6114ecd589f16874df