Merge branch 'spi-4.21' into spi-5.0

This commit is contained in:
Mark Brown 2019-01-07 12:42:08 +00:00
commit 3c9bb6a639
No known key found for this signature in database
GPG key ID: 24D68B725D5487D0