Hi Stephen, On 7 December 2011 07:53, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote: > Hi Arnd, > > Today's linux-next merge of the arm-soc tree got a conflict in > arch/arm/mach-mxs/include/mach/common.h between commit d4e717535e94 > ("ARM: restart: mxs: use new restart hook") from the arm tree and commit > 4e1b4ecaa231 ("ARM: mxs: add saif clkmux functions") from the arm-soc > tree. > > Just context changes. I fixed it up (see below) and can carry the fix as > necessary. The fix looks right. 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