Messages in this thread | | | Date | Tue, 22 Jan 2013 21:03:14 -0800 | From | Greg KH <> | Subject | Re: linux-next: manual merge of the pinctrl tree with the driver-core tree |
| |
On Wed, Jan 23, 2013 at 03:58:52PM +1100, Stephen Rothwell wrote: > Hi Linus, > > 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).
Looks good, thanks.
greg k-h
| |