Merge branch 'fixes' into next
authorUlf Hansson <ulf.hansson@linaro.org>
Fri, 27 Aug 2021 14:35:55 +0000 (16:35 +0200)
committerUlf Hansson <ulf.hansson@linaro.org>
Fri, 27 Aug 2021 14:35:55 +0000 (16:35 +0200)

Trivial merge