Merge existing fixes from spi/for-5.10

This commit is contained in:
Mark Brown 2020-10-26 20:28:19 +00:00
commit 2ee1b42e8a
No known key found for this signature in database
GPG key ID: 24D68B725D5487D0