From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jesse Barnes <jbarnes@virtuousgeek.org>
Subject: Re: linux-next: pci merge conflict
Date: Tue, 27 May 2008 21:08:32 -0700
Message-ID: <200805272108.32974.jbarnes@virtuousgeek.org>
References: <20080528122758.70c4bec9.sfr@canb.auug.org.au> <483CC873.5000300@jp.fujitsu.com>
Mime-Version: 1.0
Content-Type: text/plain;
  charset="iso-2022-jp"
Content-Transfer-Encoding: 7bit
Return-path: <linux-next-owner@vger.kernel.org>
Received: from outbound-mail-111.bluehost.com ([69.89.18.7]:59097 "HELO
	outbound-mail-111.bluehost.com" rhost-flags-OK-OK-OK-OK)
	by vger.kernel.org with SMTP id S1751021AbYE1EPP (ORCPT
	<rfc822;linux-next@vger.kernel.org>);
	Wed, 28 May 2008 00:15:15 -0400
In-Reply-To: <483CC873.5000300@jp.fujitsu.com>
Content-Disposition: inline
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>, linux-next@vger.kernel.org

On Tuesday, May 27, 2008 7:50 pm Kenji Kaneshige wrote:
> Hi Stephen-san, Jesse-san,
>
> I have already have updated patches. I'll send them if necessary.

Oops, meant to actually write a message. :)

I'll merge the Linus tree into linux-next tomorrow.  Kenji-san, I'll probably 
ask for updated patches then for anything that's in linux-next but not in 
Linus' tree yet.

Thanks,
Jesse