From: Andi Kleen Subject: Re: git-acpi in linux-next Date: Thu, 24 Jul 2008 22:09:26 +0200 Message-ID: <20080724200926.GG20882@one.firstfloor.org> References: <20080723134643.dbf1e1a1.akpm@linux-foundation.org> <20080724101217.56f7f8f5.sfr@canb.auug.org.au> <20080724140136.cc3fb2e5.sfr@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from one.firstfloor.org ([213.235.205.2]:39027 "EHLO one.firstfloor.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754385AbYGXUJ4 (ORCPT ); Thu, 24 Jul 2008 16:09:56 -0400 Content-Disposition: inline In-Reply-To: <20080724140136.cc3fb2e5.sfr@canb.auug.org.au> Sender: linux-acpi-owner@vger.kernel.org List-Id: linux-acpi@vger.kernel.org To: Stephen Rothwell Cc: Andrew Morton , Andi Kleen , Len Brown , linux-acpi@vger.kernel.org On Thu, Jul 24, 2008 at 02:01:36PM +1000, Stephen Rothwell wrote: > Hi all, > > On Thu, 24 Jul 2008 10:12:17 +1000 Stephen Rothwell wrote: > > > > I will try Len's tree again today (though the last update there is June > > 28 so I am not hopeful). > > I merged Len's tree and fixed all the conflicts and the final diff from > before to after the merge is below. Sorry for the trouble. Len's tree is still the current one, but I haven't fully fixed up yet for post 2.6.27. I'll prepare a new one for you soon The git URL will be different, but I'm sending you details. -Andi