Messages in this thread | | | Date | Tue, 28 Dec 2010 02:16:57 +1100 | From | Stephen Rothwell <> | Subject | Re: linux-next: build failure after merge of the sound tree (Was: Re: linux-next: build failure after merge of the sound-asoc tree) |
| |
Hi Mark,
On Sun, 26 Dec 2010 23:59:29 +0000 Mark Brown <broonie@opensource.wolfsonmicro.com> wrote: > > Hrm? I thought you merged the ASoC tree before the sound tree, in which > case the above is somehwat surprising. If the ASoC tree merged OK then > Takashi it should be a simple case of pulling my for-2.6.38 branch to > resolve the issue.
I started merging the sound-asoc tree *after* the sound tree when the sound-asoc tree started to be merged into the sound tree.
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |