On Mon, Dec 19, 2011 at 10:55:48AM +1100, Stephen Rothwell wrote: > Hi all, > Hi Stephen, > Today's linux-next merge of the arm-soc tree got a conflict in > arch/arm/mach-imx/mach-imx6q.c between commit 1237f0f6ecf6 ("ARM: 7198/1: > arm/imx6: add restart support for imx6q") from the arm tree and commit > 477fce49aef4 ("arm/imx6q-sabrelite: add enet phy ksz9021rn fixup") from > the arm-soc tree. > > Just context changes. I fixed it up (see below) and can carry the fix as > necessary. It looks all right. Thanks. -- Regards, 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