[alsa-devel] ASoC updates for 3.3

Mark Brown broonie at opensource.wolfsonmicro.com
Mon Jan 30 15:51:58 CET 2012

On Mon, Jan 30, 2012 at 03:27:40PM +0100, Takashi Iwai wrote:

> But this brings merge conflicts in codecs/wm5100.c.
> If you already resolved in 3.4 branch, please give it, too.

It's resolved in my for-next branch but not in my 3.4 branch, I'd been
going to merge up an -rc when one appeared with the relevant commits.
If you want to pull my for-next into your for-next that'd solve the
issue for your -next tree which is the issue I guess?
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
Url : http://mailman.alsa-project.org/pipermail/alsa-devel/attachments/20120130/52402e07/attachment.sig 

More information about the Alsa-devel mailing list