On Wed, Jan 23, 2013 at 5:58 AM, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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 -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html