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

Quoting Stephen Rothwell (2014-07-30 01:57:08) > Hi Mike, > > Today's linux-next merge of the clk tree got a conflict in > drivers/base/platform.c between commit 3d713e0e382e ("driver core: > platform: add device binding path 'driver_override'") from the > driver-core tree and commit 86be408bfbd8

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

On Wed, Jul 30, 2014 at 06:57:08PM +1000, Stephen Rothwell wrote: > Hi Mike, > > Today's linux-next merge of the clk tree got a conflict in > drivers/base/platform.c between commit 3d713e0e382e ("driver core: > platform: add device binding path 'driver_override'") from the > driver-core tree and c

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

Hi Mike, Today's linux-next merge of the clk tree got a conflict in drivers/base/platform.c between commit 3d713e0e382e ("driver core: platform: add device binding path 'driver_override'") from the driver-core tree and commit 86be408bfbd8 ("clk: Support for clock parents and rates assigned from de