From: Kalle Valo Date: Thu, 7 Dec 2017 13:50:34 +0000 (+0200) Subject: Merge tag 'iwlwifi-for-kalle-2017-12-05' of git://git.kernel.org/pub/scm/linux/kernel... X-Git-Tag: v5.15~9646^2~7^2~5 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a41886f56b7bbb88e6a23b5d738a94f2632142a4;p=platform%2Fkernel%2Flinux-starfive.git Merge tag 'iwlwifi-for-kalle-2017-12-05' of git://git./linux/kernel/git/iwlwifi/iwlwifi-fixes Third batch of iwlwifi patches intended for 4.15. * Tell mac80211 when the MAC has been stripped (9000 series); * Tell mac80211 when the IVC has been stripped (9000 series); * Add 2 new PCI IDs, one for 9000 and one for 22000; * Fix a queue hang due during ROC. --- a41886f56b7bbb88e6a23b5d738a94f2632142a4