Merge branch 'fixes' into next
authorUlf Hansson <ulf.hansson@linaro.org>
Mon, 20 Dec 2021 10:18:44 +0000 (11:18 +0100)
committerUlf Hansson <ulf.hansson@linaro.org>
Mon, 20 Dec 2021 10:18:44 +0000 (11:18 +0100)

Trivial merge