On Fri, Aug 31, 2012 at 07:06:54PM -0700, Tony Lindgren wrote: > * Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx> [120831 17:28]: > > There's a topic/omap branch in ASoC which you can pull in to help reduce > > conflicts, or I could merge this there if that's sensible. > Thanks. Did not see it yet at git://opensource.wolfsonmicro.com/linux-2.6-asoc, > maybe it's not yet pushed out? Nobody said to apply it in ASoC and it was part of a series. If people want me to apply it directly to the OMAP branch please let me know (a resend would help...). -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html