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)
commita6c3b33f02c799db69a3cd82545e45e9df3d69ca
tree02c8d17867c1c552a5c44c7c3158a27afadd0c66
parent0acfb076f7987bd4bb5cd5de879ba3e3e71724e9
parentf1f1ffa0d2fd562b610940c7374b8217597af47f
Merge branch 'pinctrl-tegra-for-next-diet' into for-next
drivers/pinctrl/Kconfig
drivers/pinctrl/Makefile