Hi Ingo,

On Thu, 24 Sep 2009 10:33:09 +0200 Ingo Molnar <mingo@elte.hu> wrote:
>
> Thanks - that's how i fixed it up yesterday, and it tested fine. Have 
> just pushed out this resolution, so the conflict should disappear from 
> linux-next tomorrow.

OK, thanks.

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