On Mon, 22 Nov 2010, Will Deacon wrote: > Commit 1b6740a1 was marked as stable but conflicts with 93068241. > > This patch resolves the conflict so that an OProfile-enabled ARM > kernel can be used. > > Cc: Catalin Marinas <catalin.mari...@arm.com> > Cc: Linaro Dev <linaro-dev@lists.linaro.org> > Signed-off-by: Will Deacon <will.dea...@arm.com> > --- > > Nicolas - this patch fixes an unresolved merge conflict present in the > Linaro 2.6.35-stable tree which results in build failure if oprofile is > enabled. > The resolution isn't especially trivial but I think I've got it right.
Applied, thanks. Nicolas _______________________________________________ linaro-dev mailing list linaro-dev@lists.linaro.org http://lists.linaro.org/mailman/listinfo/linaro-dev
