Messages in this thread | | | Date | Wed, 23 Jan 2013 09:28:25 +0100 | Subject | Re: linux-next: manual merge of the pinctrl tree with the driver-core tree | From | Linus Walleij <> |
| |
On Wed, Jan 23, 2013 at 5:58 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Today's linux-next merge of the pinctrl tree got a conflict in > drivers/pinctrl/pinctrl-nomadik.c between commit 9e0c1fb29a7c ("pinctrl: > Convert to devm_ioremap_resource()") from the driver-core tree and commit > 50f690d85e4e ("pinctrl/nomadik: simplify GPIO probe") from the pinctrl > tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required).
Excellent, looking good.
Thanks Stephen! Linus Walleij
| |