* Mark Brown broonie@opensource.wolfsonmicro.com [090819 11:27]:
On Wed, Aug 19, 2009 at 10:48:35AM +0300, Eduardo Valentin wrote:
On Wed, Aug 19, 2009 at 09:40:12AM +0200, Valentin Eduardo (Nokia-D/Helsinki) wrote:
About these changes. I have one doubt. What is the correct tree to base them? There are changes under arch/arm/plat-omap/ and under sound/soc/omap/.
...
Please do not apply this version. Let's define this first, then I send the correct version.
There is 1 Jarkko's patch which changes arch/arm/plat-omap/ which is already in Takashi's tree, IIRC.
I believe there's colisons with the OMAP1 stuff too. Might be worth applying these on a branch and then providing merges into both the ASoC and OMAP trees?
I'm fine with these all going in via the alsa tree. If there are conflicts, let's get those parts into the omap for-next branch first.
Tony