Merge branch 'pl061' into devel
authorLinus Walleij <linus.walleij@linaro.org>
Wed, 7 Dec 2016 14:23:45 +0000 (15:23 +0100)
committerLinus Walleij <linus.walleij@linaro.org>
Wed, 7 Dec 2016 14:23:45 +0000 (15:23 +0100)

Trivial merge