Merge branch 'fixes' into next
authorUlf Hansson <ulf.hansson@linaro.org>
Mon, 28 Feb 2022 17:04:27 +0000 (18:04 +0100)
committerUlf Hansson <ulf.hansson@linaro.org>
Mon, 28 Feb 2022 17:04:27 +0000 (18:04 +0100)

Trivial merge