Hi Ingo,

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

Excellent, thanks.

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