Merge existing fixes from regulator/for-5.15

This commit is contained in:
Mark Brown 2021-09-13 01:41:47 +01:00
commit c33e65cbbd
No known key found for this signature in database
GPG key ID: 24D68B725D5487D0