]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'devel' into for-next
authorLinus Walleij <linus.walleij@linaro.org>
Thu, 23 Aug 2012 22:17:02 +0000 (00:17 +0200)
committerLinus Walleij <linus.walleij@linaro.org>
Thu, 23 Aug 2012 22:17:02 +0000 (00:17 +0200)

Trivial merge