]> git.baikalelectronics.ru Git - kernel.git/commit
Merge tag 'pinctrl-mergebase-20120418' into HEAD
authorLinus Walleij <linus.walleij@linaro.org>
Fri, 11 May 2012 07:04:22 +0000 (09:04 +0200)
committerLinus Walleij <linus.walleij@linaro.org>
Fri, 11 May 2012 07:04:22 +0000 (09:04 +0200)
commit9d20ebf69b2e959db2d2621dcf5d4e83f5d3c38f
treeba257ac34b1ce57a29ec0d603b9e7d6400d6bea0
parentd7926e2ce6cf6600069a368e8d7d00738126d958
parent9d4a21d8c4e1fa12afdbf95ef978a7a715cd5ae3
Merge tag 'pinctrl-mergebase-20120418' into HEAD

Conflicts:
drivers/pinctrl/core.c