Re: linux-next: manual merge of the sound tree with the davincitree
From: Stephen Rothwell
Date: Thu Jul 23 2009 - 21:12:53 EST
Hi Takashi, Kevin,
On Fri, 24 Jul 2009 01:10:50 +0200 Takashi Iwai <tiwai@xxxxxxx> wrote:
>
> At Thu, 23 Jul 2009 10:54:44 -0700,
> Kevin Hilman wrote:
> >
> > I've taken care of this in the DaVinci for-next branch.
> >
> > I dropped the davinci changes that change code that were then dropped
> > by the asoc changes.
>
> Ah, great. Then I revert a fix merge in my for-next branch and keep
> only pure ASoC things.
Thanks.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgp00000.pgp
Description: PGP signature