On Fri, Jul 25, 2008 at 2:10 PM, Linus Torvalds <[EMAIL PROTECTED]> wrote: > > > 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.
Okay, I'll do that g. -- Grant Likely, B.Sc., P.Eng. Secret Lab Technologies Ltd. _______________________________________________ Linuxppc-dev mailing list Linuxppc-dev@ozlabs.org https://ozlabs.org/mailman/listinfo/linuxppc-dev
