Merge branch 'gpio/merge' of git://git.secretlab.ca/git/linux-2.6 into grant
authorLinus Walleij <linus.walleij@linaro.org>
Thu, 5 Jul 2012 14:58:54 +0000 (16:58 +0200)
committerLinus Walleij <linus.walleij@linaro.org>
Thu, 5 Jul 2012 14:58:54 +0000 (16:58 +0200)
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

Trivial merge