Merge branch 'devel-mt2701' into devel
authorLinus Walleij <linus.walleij@linaro.org>
Tue, 9 Feb 2016 09:54:48 +0000 (10:54 +0100)
committerLinus Walleij <linus.walleij@linaro.org>
Tue, 9 Feb 2016 09:54:48 +0000 (10:54 +0100)

Trivial merge