Re: linux-next: manual merge of the sound tree with the omap tree

[Takashi Iwai]

At Fri, 13 Nov 2009 13:11:48 +0000,
Mark Brown wrote:
> 
> On Fri, Nov 13, 2009 at 02:06:44PM +0100, Takashi Iwai wrote:
> > Mark Brown wrote:
> 
> > > into the OMAP tree to resolve this.  There's some older ASoC changes in
> > > there to ensure the patches applied but I'm happy for you to carry those
> > > providing Takashi is.
> 
> > I can merge the tree above to for-next branch of sound git tree, too.
> > In that way, we can keep asoc branches clean.
> 
> I believe that creates the same problem both ways :/ .  If we merge
> OMAP->sound we may as well put it on the ASoC topic branch, it'll
> probably be helpful for people doing OMAP work anyway.

OK, in both ways I don't care...


thanks,

Takashi
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/