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

From: Stephen Rothwell
Date: Mon Jan 18 2010 - 03:59:17 EST

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.

Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature