Return-Path: <linux-kernel-owner+w=401wt.eu-S1755341AbYGYSzZ@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1755341AbYGYSzZ (ORCPT <rfc822;w@1wt.eu>);
	Fri, 25 Jul 2008 14:55:25 -0400
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751855AbYGYSzJ
	(ORCPT <rfc822;linux-kernel-outgoing>);
	Fri, 25 Jul 2008 14:55:09 -0400
Received: from wx-out-0506.google.com ([66.249.82.232]:12418 "EHLO
	wx-out-0506.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1751833AbYGYSzI (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Fri, 25 Jul 2008 14:55:08 -0400
Message-ID: <fa686aa40807251155i399f8ab0x931e1f44dd6fd82a@mail.gmail.com>
Date: Fri, 25 Jul 2008 14:55:07 -0400
From: "Grant Likely" <grant.likely@secretlab.ca>
To: "Linus Torvalds" <torvalds@linux-foundation.org>
Subject: Re: [git pull] Please pull from powerpc.git merge branch
Cc: "Benjamin Herrenschmidt" <benh@kernel.crashing.org>,
       "linuxppc-dev list" <linuxppc-dev@ozlabs.org>,
       akpm <akpm@linux-foundation.org>,
       "Linux Kernel list" <linux-kernel@vger.kernel.org>
In-Reply-To: <alpine.LFD.1.10.0807251108320.5249@nehalem.linux-foundation.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Disposition: inline
References: <1216973590.11188.99.camel@pasglop>
	 <alpine.LFD.1.10.0807251108320.5249@nehalem.linux-foundation.org>
X-Google-Sender-Auth: cf000b3ebffd9aa9
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
Content-Transfer-Encoding: 8bit
X-MIME-Autoconverted: from base64 to 8bit by alpha.home.local id m6PItTfq021685
Content-Length: 605
Lines: 4

On Fri, Jul 25, 2008 at 2:10 PM, Linus Torvalds<torvalds@linux-foundation.org> 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?+???????+%?????ݶ??w??{.n?+????{??G?????{ay?ʇڙ?,j??f???h?????????z_??(?階?ݢj"???m??????G????????????&???~???iO???z??v?^?m????????????I?