Subject: Re: linux-next: manual merge of the sound tree

From: David Miller <[email-masked]>
Date: Mon, 01 Sep 2008 02:44:36 -0700 (PDT)

From: Takashi Iwai <[email-masked]>
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.