From mboxrd@z Thu Jan  1 00:00:00 1970
From: David Miller <davem@davemloft.net>
Subject: Re: linux-next: manual merge of the sound tree
Date: Mon, 01 Sep 2008 02:44:36 -0700 (PDT)
Message-ID: <20080901.024436.190398553.davem@davemloft.net>
References: <s5hej4476p0.wl%tiwai@suse.de>
	<20080901.012827.193698949.davem@davemloft.net>
	<s5hk5dwfenb.wl%tiwai@suse.de>
Mime-Version: 1.0
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Return-path: <linux-next-owner@vger.kernel.org>
Received: from 74-93-104-97-Washington.hfc.comcastbusiness.net ([74.93.104.97]:35403
	"EHLO sunset.davemloft.net" rhost-flags-OK-FAIL-OK-OK)
	by vger.kernel.org with ESMTP id S1751827AbYIAJom (ORCPT
	<rfc822;linux-next@vger.kernel.org>); Mon, 1 Sep 2008 05:44:42 -0400
In-Reply-To: <s5hk5dwfenb.wl%tiwai@suse.de>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: tiwai@suse.de
Cc: sfr@canb.auug.org.au, linux-next@vger.kernel.org

From: Takashi Iwai <tiwai@suse.de>
Date: Mon, 01 Sep 2008 10:34:32 +0200

> But, I guess we'd need to fix the conflict anyway when 2.6.28 merge
> window is opened.

I think it will be easy to resolve, either way.