Merge tag 'iwlwifi-for-kalle-2015-10-05' of git://git.kernel.org/pub/scm/linux/kernel...
authorKalle Valo <kvalo@codeaurora.org>
Wed, 7 Oct 2015 08:12:01 +0000 (11:12 +0300)
committerKalle Valo <kvalo@codeaurora.org>
Wed, 7 Oct 2015 08:12:01 +0000 (11:12 +0300)
commitde28a05ee28e36fa1fc68fcfc7c6cc1c6f7c270c
tree76a141f72957a8571d7e48a2159c4b14c303a199
parent54328e64047a54b8fc2362c2e1f0fa16c90f739f
parentdbf73d4a8bb8f4e1d1f3edd3be825692279e2ef3
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;