Merge branch 'devel' into for-next
authorLinus Walleij <linus.walleij@linaro.org>
Mon, 23 Sep 2013 09:26:59 +0000 (11:26 +0200)
committerLinus Walleij <linus.walleij@linaro.org>
Mon, 23 Sep 2013 09:26:59 +0000 (11:26 +0200)

Trivial merge