Merge branch 'fixes' into devel
authorLinus Walleij <linus.walleij@linaro.org>
Fri, 23 Sep 2016 15:41:40 +0000 (17:41 +0200)
committerLinus Walleij <linus.walleij@linaro.org>
Fri, 23 Sep 2016 15:41:40 +0000 (17:41 +0200)

Trivial merge