| commit | b9e3b72d4a8b3a6c85474455f464e12b4ef1cfc1 | [log] [tgz] |
|---|---|---|
| author | Linus Walleij <linus.walleij@linaro.org> | Fri May 11 09:04:22 2012 +0200 |
| committer | Linus Walleij <linus.walleij@linaro.org> | Fri May 11 09:04:22 2012 +0200 |
| tree | ba257ac34b1ce57a29ec0d603b9e7d6400d6bea0 | |
| parent | c0af14d3212a54c6a11759cd6b78e755c68714a1 [diff] | |
| parent | dcb5dbc305b975cccf40942feba40964069541d3 [diff] |
Merge tag 'pinctrl-mergebase-20120418' into HEAD Conflicts: drivers/pinctrl/core.c