]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'nomadik' into for-next
authorLinus Walleij <linus.walleij@linaro.org>
Sun, 28 Oct 2012 20:30:49 +0000 (21:30 +0100)
committerLinus Walleij <linus.walleij@linaro.org>
Sun, 28 Oct 2012 20:30:49 +0000 (21:30 +0100)

Trivial merge