Merge branch 'allwinner-sunxi' into devel
authorLinus Walleij <linus.walleij@linaro.org>
Fri, 8 Feb 2013 13:26:49 +0000 (14:26 +0100)
committerLinus Walleij <linus.walleij@linaro.org>
Fri, 8 Feb 2013 13:26:49 +0000 (14:26 +0100)

Trivial merge