Merge branch 'pinctrl-tegra-for-next-diet' into for-next
authorLinus Walleij <linus.walleij@linaro.org>
Tue, 6 Mar 2012 22:30:15 +0000 (23:30 +0100)
committerLinus Walleij <linus.walleij@linaro.org>
Tue, 6 Mar 2012 22:30:15 +0000 (23:30 +0100)

Trivial merge