]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'nomadik' into for-next
authorLinus Walleij <linus.walleij@linaro.org>
Wed, 24 Oct 2012 11:39:21 +0000 (13:39 +0200)
committerLinus Walleij <linus.walleij@linaro.org>
Wed, 24 Oct 2012 11:39:21 +0000 (13:39 +0200)
commit1633426372cbdfd09b920c5b20c5b90a759b6363
tree833de91ca0ce7b38df60b8ca4a00907b49d41a55
parent27a36955d0a4940c06d7e0d6c939ac488e05dfaa
parent560bcff7da475fe7aa7f14165770371d68f19408
Merge branch 'nomadik' into for-next

Conflicts:
drivers/pinctrl/pinctrl-nomadik.c
drivers/pinctrl/pinctrl-nomadik.c