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

[Stephen Rothwell]

Hi Jiri,

On Thu, 10 Dec 2009 09:45:27 +0100 (CET) Jiri Kosina <jkosina@xxxxxxx> 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                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature