On Tue, Oct 22, 2013 at 05:10:49PM +0200, Thierry Reding wrote: > Today's linux-next merge of the mvebu tree got conflicts in > > arch/arm/mach-kirkwood/board-dt.c > > caused by commits a169e3a (ARM: kirkwood: remove custom .init_time hook) > and 14867b4 (ARM: kirkwood: remove lagacy clk workarounds). > > I fixed them up (see below). Please verify that the resolution looks good. Looks good, thx, Jason. -- 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
