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
> Cc: Linaro Dev
> Signed-off-by: Will Deacon
> ---
>
> Nicolas - thi
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
Cc: Linaro Dev
Signed-off-by: Will Deacon
---
Nicolas - this patch fixes an unresolved merge conflict present in the
Linar
