Subject: Re: linux-next: manual merge of the rr tree

From: Stephen Rothwell <[email-masked]>
Date: Tue, 6 Jan 2009 14:46:40 +1100

Hi Rusty,

On Mon, 5 Jan 2009 19:11:52 +1030 Rusty Russell <[email-masked]> wrote:
>
> On Monday 05 January 2009 14:02:39 Stephen Rothwell wrote:
> > Similarly with init/main.c, include/linux/percpu.h,
> > include/asm-generic/percpu.h and arch/x86/include/asm/percpu.h (though
> > against different commits/trees, of course).
> 
> OK, here's the merge as I did it.  I've also attached a tarball of the files
> post-merge.

Sorry to put you to all this work, but Ingo has rendered it unneeded by
dropping the other patches.

-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/