RE: linux-next: manual merge of the davinci tree with Linus' tree

[Nori, Sekhar]

Hi Stephen,

On Tue, Aug 03, 2010 at 07:18:53, Stephen Rothwell wrote:
> Hi Kevin,
>
> Today's linux-next merge of the davinci tree got a conflict in
> arch/arm/mach-davinci/board-da850-evm.c between commit
> 8b24599e72c9aee1ea1187e29cb9c5de9f449cce ("davinci: da850/omap-l138 evm:
> account for DEFDCDC{2,3} being tied high") from Linus' tree and commit
> ebd1e7808b2fe72d627bdab7bcf61126a831ca5a ("davinci: da850 evm: sparse
> cleanup: make file local variables static") from the davinci tree.
>
> Just context changes.  I fixed it up (see below) and can carry the fix
> for a while.

Thanks for fixing this.

Kevin is on a vacation. There would be a delayed response.

Regards,
Sekhar
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/