Merge branch 'kevin' into fixes
authorLinus Walleij <linus.walleij@linaro.org>
Mon, 9 Jul 2012 18:02:28 +0000 (20:02 +0200)
committerLinus Walleij <linus.walleij@linaro.org>
Mon, 9 Jul 2012 18:02:28 +0000 (20:02 +0200)

Trivial merge