Subject: Re: linux-next: manual merge of the trivial tree with the net-current tree

From: Stephen Rothwell <[email-masked]>
Date: Thu, 10 Dec 2009 22:14:06 +1100

Hi Jiri,

On Thu, 10 Dec 2009 09:45:27 +0100 (CET) Jiri Kosina <[email-masked]> wrote:
>
> Linus has merged trivial tree into his tree tonight, so I am afraid that 
> davem will have to fix the conflict when pulling Linus tree into 
> net-current.

Yep, or Linus can fix it if he feels inclined.

-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/