]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'nomadik' into for-next
authorLinus Walleij <linus.walleij@linaro.org>
Thu, 8 Nov 2012 13:58:37 +0000 (14:58 +0100)
committerLinus Walleij <linus.walleij@linaro.org>
Thu, 8 Nov 2012 13:58:37 +0000 (14:58 +0100)

Trivial merge