Merge branch 'ib-sx150x' into devel
authorLinus Walleij <linus.walleij@linaro.org>
Mon, 24 Oct 2016 14:30:55 +0000 (16:30 +0200)
committerLinus Walleij <linus.walleij@linaro.org>
Mon, 24 Oct 2016 14:30:55 +0000 (16:30 +0200)

Trivial merge