linux-next: manual merge of the pinctrl tree with the driver-core tree

2014-11-09 Thread Stephen Rothwell
Hi Linus, Today's linux-next merge of the pinctrl tree got a conflict in drivers/pinctrl/pinctrl-rockchip.c between commit 9198f509c888 ("pinctrl: rockchip: add suspend/resume functions") from the driver-core tree and commit 5c759d73b022 ("pinctrl: drop owner assignment from platform_drivers") fro

Re: linux-next: manual merge of the pinctrl tree with the driver-core tree

2013-01-23 Thread Linus Walleij
On Wed, Jan 23, 2013 at 5:58 AM, Stephen Rothwell 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

Re: linux-next: manual merge of the pinctrl tree with the driver-core tree

2013-01-22 Thread Greg KH
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 >

linux-next: manual merge of the pinctrl tree with the driver-core tree

2013-01-22 Thread Stephen Rothwell
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.