tree ba257ac34b1ce57a29ec0d603b9e7d6400d6bea0
parent c0af14d3212a54c6a11759cd6b78e755c68714a1
parent dcb5dbc305b975cccf40942feba40964069541d3
author Linus Walleij <linus.walleij@linaro.org> 1336719862 +0200
committer Linus Walleij <linus.walleij@linaro.org> 1336719862 +0200

Merge tag 'pinctrl-mergebase-20120418' into HEAD

Conflicts:
	drivers/pinctrl/core.c