diff options
| author | Kalle Valo <kvalo@codeaurora.org> | 2017-12-07 15:50:34 +0200 |
|---|---|---|
| committer | Kalle Valo <kvalo@codeaurora.org> | 2017-12-07 15:50:34 +0200 |
| commit | a41886f56b7bbb88e6a23b5d738a94f2632142a4 (patch) | |
| tree | de46541e89acaaaf3b69c1ea4543715c155876e1 /drivers/watchdog/ux500_wdt.c | |
| parent | 51ef7925e10688c57186d438e784532e063492e4 (diff) | |
| parent | bf19037074e770aad74b3b90f37b8b98db3f3748 (diff) | |
Merge tag 'iwlwifi-for-kalle-2017-12-05' of git://git.kernel.org/pub/scm/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.
Diffstat (limited to 'drivers/watchdog/ux500_wdt.c')
0 files changed, 0 insertions, 0 deletions