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

From: Stephen Rothwell <[email-masked]>
Date: Mon, 1 Sep 2008 19:03:07 +1000

On Mon, 01 Sep 2008 10:34:32 +0200 Takashi Iwai <[email-masked]> wrote:
>
> > The other option is for Stephen to just keep fixing the merge,
> > if we just do nothing his way of doing this is automated.
> 
> That's fine for me, too.
> But, I guess we'd need to fix the conflict anyway when 2.6.28 merge
> window is opened.

Thats fine by me.  Looks like whoever gets in first in the merge window
wins :-)

-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/