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

[Grant Likely]

On Fri, Jul 25, 2008 at 2:10 PM, Linus Torvalds
<torvalds@xxxxxxxxxxxxxxxxxxxx> 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.
èº{.nÇ+‰·Ÿ®‰­†+%ŠËlzwm…ébëæìr¸›zX§»®w¥Š{ayºÊÚë,j­¢f£¢·hš‹àz¹®w¥¢¸¢·¦j:+v‰¨ŠwèjØm¶Ÿÿ¾«‘êçzZ+ƒùšŽŠÝj"ú!¶iO•æ¬z·švØ^¶m§ÿðÃnÆàþY&—