Merge branch 'ixp4-cleanup' into devel
authorLinus Walleij <linus.walleij@linaro.org>
Fri, 27 Sep 2013 12:46:56 +0000 (14:46 +0200)
committerLinus Walleij <linus.walleij@linaro.org>
Fri, 27 Sep 2013 12:46:56 +0000 (14:46 +0200)

Trivial merge