]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'u300' into for-next
authorLinus Walleij <linus.walleij@linaro.org>
Wed, 24 Oct 2012 11:39:37 +0000 (13:39 +0200)
committerLinus Walleij <linus.walleij@linaro.org>
Wed, 24 Oct 2012 11:39:37 +0000 (13:39 +0200)

Trivial merge