tree 4eb04d0a2890f2e0a182e762071fea4ffb5abe5d
parent 6887a4131da3adaab011613776d865f4bcfb5678
parent 96b70641b937e99c1579cb6ebbcdb7b0af98cdd0
author Linus Walleij <linus.walleij@linaro.org> 1341500334 +0200
committer Linus Walleij <linus.walleij@linaro.org> 1341500334 +0200

Merge branch 'gpio/merge' of git://git.secretlab.ca/git/linux-2.6 into grant

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