]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'u300' into devel
authorLinus Walleij <linus.walleij@linaro.org>
Tue, 6 Nov 2012 08:10:32 +0000 (09:10 +0100)
committerLinus Walleij <linus.walleij@linaro.org>
Tue, 6 Nov 2012 08:10:32 +0000 (09:10 +0100)

Trivial merge