]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'devel' into for-next
authorLinus Walleij <linus.walleij@linaro.org>
Mon, 15 Oct 2012 07:54:59 +0000 (09:54 +0200)
committerLinus Walleij <linus.walleij@linaro.org>
Mon, 15 Oct 2012 07:54:59 +0000 (09:54 +0200)
commitde1d1897e9cc8f7f685d47c401addabae7ce1615
tree8cfa5c6207a0aa02894f3f853ed32a262775ff57
parent51f58c68a364363b29c07668c90af19c9b8a8c85
parent46f5434892a69c614a40a3b9159541bc185026d2
Merge branch 'devel' into for-next

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