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)
commitb9e3b72d4a8b3a6c85474455f464e12b4ef1cfc1
treeba257ac34b1ce57a29ec0d603b9e7d6400d6bea0
parentc0af14d3212a54c6a11759cd6b78e755c68714a1
parentdcb5dbc305b975cccf40942feba40964069541d3
Merge tag 'pinctrl-mergebase-20120418' into HEAD

Conflicts:
drivers/pinctrl/core.c