On Tue, Oct 08, 2013 at 03:44:13PM +0200, Thierry Reding wrote: > Today's linux-next merge of the mvebu tree got conflicts in: > > arch/arm/mach-dove/board-dt.c > > caused by commits ffe195c (ARM: dove: remove legacy pcie and clock init), > e3730b4 (ARM: dove: switch to DT probed mbus address windows), and 51e40f5 > (ARM: dove: remove custom .init_time hook). > > I fixed them up (see below). Please verify that the resolution looks > correct. Looks good to me, thanks! 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
