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

[Stephen Rothwell]

Hi Jiri,

On Mon, 30 Nov 2009 13:36:18 +0100 (CET) Jiri Kosina <jkosina@xxxxxxx> wrote:
>
> Dropped the falcon.c hunk from the pile, so the conflict should be gone.

Thanks for that.

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

Attachment: pgp00000.pgp
Description: PGP signature