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

[Stephen Rothwell]

Hi Jiri,

On Sat, 8 Aug 2009 02:13:36 +0200 (CEST) Jiri Kosina <jkosina@xxxxxxx> wrote:
>
> [ sorry for late reply, have been on vacation, totally offline, for two 
>   weeks ]

Hey, no worries :-)

> I have fast-forwarded the 'for-next' branch of trivial tree and fixed the 
> conflict, so it should be OK the next time you pull.

Thanks.

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

Attachment: pgp00000.pgp
Description: PGP signature