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

[Stephen Rothwell]

Hi Ingo,

On Mon, 18 Jan 2010 08:50:25 +0100 Ingo Molnar <mingo@xxxxxxx> wrote:
>
> FYI, i resolved the conflict already in tip:master yesterday, a bit 
> differently.

Excellent, thanks.

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

Attachment: pgp00000.pgp
Description: PGP signature