On Tue, Oct 2, 2012 at 1:29 PM, Stefano Stabellini <[email protected]> wrote: > The Xen tree tries to add a line to > arch/arm/mach-vexpress/Makefile.boot that has been removed by the > following commit in Linus' master: > > commit 617276307cd4cdb9a95c77efaa3063695af63aa7 > Author: Rob Herring <[email protected]> > Date: Thu Sep 6 13:43:04 2012 -0500 > > ARM: vexpress: convert to multi-platform > > In fact the dts Makefile is now arch/arm/boot/dts/Makefile, as per > commit 9cd11c0c47b8690b47e7573311ce5c483cb344ed. > > > This is the merge resolution patch. > > Signed-off-by: Stefano Stabellini <[email protected]>
Great. Thanks for posting it! -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
