Re: [git pull] Please pull from powerpc.git merge branch

From: Linus Torvalds
Date: Fri Jul 25 2008 - 14:14:39 EST




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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/