please pull the powerpc-merge.git tree

[Paul Mackerras]

Linus Torvalds writes:

> But I was going to release a -rc1 today (unless Andrew), and I do want 
> things to just "work". So for me the question there is whether I just do 
> the one-liner Makefile thing to force "ppc64" -> "powerpc", or whether you 
> can get me a quick patch that gets ppc64 going again.

Just sent you the one-liner patch to make ppc64 machines default to
ARCH=powerpc.

> I don't care terribly which way it goes, and if ppc64 ends up disabled in 
> -rc1 and dying off entirely during -rc2, that's ok by me.

There are still a few files left in arch/ppc64 and include/asm-ppc64.
Hopefully we can get them moved over by -rc2.

> So kill it off now, or kill it off after 2.6.15, that's what the choice 
> boils down to. 

Let's kill it now.

Paul.