Re: linux-next: manual merge of the usb tree with the i.MX tree

[Greg KH]

On Fri, Mar 04, 2011 at 03:58:00PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the usb tree got a conflict in
> drivers/usb/gadget/fsl_mxc_udc.c between commit
> 4d2f13be1e370a670c1cae20c194d5ce961e0fa5 ("ARM: imx3x: clean up
> ARCH_MX3X") from the i.MX tree and commit
> a51ea8cc9cfcfd719240455ff8f217b4f165d1d0 ("usb: gadget/fsl_mxc_udc:
> Detect the CPU type in run-time") from the usb tree.
> 
> The latter is a superset of the former, so I used that.

Thanks, I appreciate it.

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/