]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'devel' into for-next
authorLinus Walleij <linus.walleij@linaro.org>
Thu, 28 Jan 2016 11:24:19 +0000 (12:24 +0100)
committerLinus Walleij <linus.walleij@linaro.org>
Thu, 28 Jan 2016 11:24:19 +0000 (12:24 +0100)

Trivial merge