On Tue, Oct 08, 2013 at 03:44:12PM +0200, Thierry Reding wrote: > Today's linux-next merge of the imx-mxs tree got conflicts in > > arch/arm/mach-imx/mach-imx6q.c > > caused by commits 4d9d18a (ARM: imx: remove custom .init_time hook), > e709f38 (ARM: imx6: report soc info via soc device) and 3087d32 (ARM: > imx6q: use common soc revision helpers). > > I fixed it up (see below). Please verify that the resolution looks > correct. Thanks, Thierry. The resolution is correct. Shawn -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
