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

[Greg KH]

On Mon, Aug 29, 2011 at 02:31:50PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the driver-core tree got a conflict in
> arch/arm/plat-mxc/devices.c between commit 160a84cfc975 ("ARM: mxc: drop
> now unused function mxc_register_device") from the arm-soc tree and
> commit 0e392412f334 ("ARM: mxc: convert device creation to use
> platform_device_register_full") from the driver-core tree.
> 
> Just context changes.  I fixed it up (see below) anc can carry the fix as
> necessary.

Thanks, that looks fine.

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/