Merge branch 'fixes' into next
authorUlf Hansson <ulf.hansson@linaro.org>
Tue, 18 Jun 2019 11:32:07 +0000 (13:32 +0200)
committerUlf Hansson <ulf.hansson@linaro.org>
Tue, 18 Jun 2019 11:32:07 +0000 (13:32 +0200)

Trivial merge