Re: linux-next: manual merge of the omap tree with Linus' tree

From: Stephen Rothwell
Date: Sat Oct 31 2009 - 00:30:37 EST


Hi Tony,

On Fri, 30 Oct 2009 07:45:18 -0700 Tony Lindgren <tony@xxxxxxxxxxx> wrote:
>
> Thanks, will rebase omap for-next patches today.

Or you could just do a merge with Linus' tree (or the part of Linus' tree
that you clash with) ...

But thanks either way.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature