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

From: Stephen Rothwell <[email-masked]>
Date: Sat, 31 Oct 2009 15:30:04 +1100

Hi Tony,

On Fri, 30 Oct 2009 07:45:18 -0700 Tony Lindgren <[email-masked]> 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                    [email-masked]
http://www.canb.auug.org.au/~sfr/