Merge branch 'fixes' into next
authorUlf Hansson <ulf.hansson@linaro.org>
Wed, 10 Oct 2018 12:03:19 +0000 (14:03 +0200)
committerUlf Hansson <ulf.hansson@linaro.org>
Wed, 10 Oct 2018 12:03:19 +0000 (14:03 +0200)

Trivial merge