Merge tag 'wireless-drivers-for-davem-2015-10-17' of git://git.kernel.org/pub/scm...
authorDavid S. Miller <davem@davemloft.net>
Mon, 19 Oct 2015 06:05:56 +0000 (23:05 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 19 Oct 2015 06:05:56 +0000 (23:05 -0700)
commitafc050dd8e3387f71def1d6114ecd589f16874df
treeec4db4c578906a06bf079c6ba3944b9e099f32cf
parente277de5f3f7d6eed2a41920983c44c4df386b871
parentde28a05ee28e36fa1fc68fcfc7c6cc1c6f7c270c
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>