From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752755AbZIOWgp (ORCPT ); Tue, 15 Sep 2009 18:36:45 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751526AbZIOWgl (ORCPT ); Tue, 15 Sep 2009 18:36:41 -0400 Received: from darkcity.gna.ch ([195.226.6.51]:47140 "EHLO mail.gna.ch" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751117AbZIOWgl convert rfc822-to-8bit (ORCPT ); Tue, 15 Sep 2009 18:36:41 -0400 X-Greylist: delayed 457 seconds by postgrey-1.27 at vger.kernel.org; Tue, 15 Sep 2009 18:36:40 EDT Subject: Re: [git pull] Please pull powerpc.git next branch From: Michel =?ISO-8859-1?Q?D=E4nzer?= To: Benjamin Herrenschmidt Cc: Linus Torvalds , linuxppc-dev list , Andrew Morton , Linux Kernel list , Ingo Molnar , FUJITA Tomonori In-Reply-To: <1253051488.8375.233.camel@pasglop> References: <1252653473.8566.98.camel@pasglop> <1252999835.8375.205.camel@pasglop> <1253051488.8375.233.camel@pasglop> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8BIT Date: Wed, 16 Sep 2009 00:29:01 +0200 Message-Id: <1253053741.5669.1990.camel@thor> Mime-Version: 1.0 X-Mailer: Evolution 2.26.3 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 2009-09-16 at 07:51 +1000, Benjamin Herrenschmidt wrote: > On Tue, 2009-09-15 at 09:53 -0700, Linus Torvalds wrote: > > It got a conflict with the AGP merge, but I fixed it up in what _seemed_ > > to be the obvious manner. But somebody should check out the resulting > > drivers/char/agp/uninorth-agp.c file. > > Thanks. > > Michel, can you dbl check it ? Looks good to me, thanks. -- Earthling Michel Dänzer | http://www.vmware.com Libre software enthusiast | Debian, X and DRI developer