please pull the powerpc-merge.git tree

[Paul Mackerras]

David Woodhouse writes:

> The ppc64 build (http://david.woodhou.se/powerpc-merge-64.config) fares
> worse than ppc32 for me -- it doesn't even build. 

Those errors were all due to getting powerbook sleep code included
because you have CONFIG_PM=y.  I have changed things so that that code
doesn't get included on a 64-bit build (at least until BenH gets sleep
going on the G5 :).

I also pulled in Linus' tree, and now drivers/char/tlclk.c fails to
build for some reason.  I claim that's not my fault, however. :)

Paul.