On Fri, 25 Jul 2008, Benjamin Herrenschmidt wrote: > > git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git merge Ok, I got a conflict in arch/powerpc/platforms/52xx/Kconfig, you should check that I fixed it up right and send me follow-up patches if required. Linus