Merge branch 'nomadik' into devel
authorLinus Walleij <linus.walleij@linaro.org>
Sun, 11 Nov 2012 18:12:46 +0000 (19:12 +0100)
committerLinus Walleij <linus.walleij@linaro.org>
Sun, 11 Nov 2012 18:12:46 +0000 (19:12 +0100)

Trivial merge