On Mon, 01 Sep 2008 10:34:32 +0200 Takashi Iwai <tiwai@xxxxxxx> 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 sfr@xxxxxxxxxxxxxxxx http://www.canb.auug.org.au/~sfr/
Attachment:
pgpQj7lc0KSz3.pgp
Description: PGP signature
