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)
commit5e67cc4041304a0dc77e6cfbb355d69eefb883d0
tree4eb04d0a2890f2e0a182e762071fea4ffb5abe5d
parent6887a4131da3adaab011613776d865f4bcfb5678
parent96b70641b937e99c1579cb6ebbcdb7b0af98cdd0
Merge branch 'gpio/merge' of git://git.secretlab.ca/git/linux-2.6 into grant

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>