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

Trivial merge