[alsa-devel] ASoC updates for 3.3

[Takashi Iwai]

At Mon, 30 Jan 2012 13:34:05 +0000,
Mark Brown wrote:
> 
> The following changes since commit c83f1d7e71625801c72f4013291194e09b6f0a6e:
> 
>   ASoC: wm2000: Fix use-after-free - don't release_firmware() twice on error (2012-01-24 11:34:19 +0000)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git asoc-3.3
> 
> for you to fetch changes up to 1ae5cbc52e7c6619a3f44b87809fd25370df31bb:
> 
>   ASoC: neo1973_wm8753: remove references to the neo1973-gta01 machine (2012-01-30 13:22:13 +0000)
> 
> ----------------------------------------------------------------
> A bunch of small driver specific fixes - nothing terribly exciting here,
> all of this will only affect people using particular devices and then
> usually only in some use cases.
> ----------------------------------------------------------------

OK, I can try the signed pull once again.

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


thanks,

Takashi


> 
> Denis 'GNUtoo' Carikli (1):
>       ASoC: neo1973_wm8753: remove references to the neo1973-gta01 machine
> 
> Mark Brown (6):
>       ASoC: wm5100: Make sure we switch to button reporting mode
>       ASoC: wm5100: Fix microphone configuration
>       ASoC: wm8996: Mark register cache as dirty when regulators are disabled
>       ASoC: wm8962: Mark register cache as dirty when regulators are disabled
>       ASoC: wm5100: Mark register cache as dirty when regulators are disabled
>       ASoC: wm_hubs: Enable line out VMID buffer for single ended line outputs
> 
> UK KIM (1):
>       ASoC: wm_hubs: fix wrong bits for LINEOUT2 N/P mixer
> 
>  sound/soc/codecs/wm5100.c          |   12 ++++++-
>  sound/soc/codecs/wm8962.c          |    2 +-
>  sound/soc/codecs/wm8996.c          |    2 +-
>  sound/soc/codecs/wm_hubs.c         |   10 ++++-
>  sound/soc/samsung/neo1973_wm8753.c |   65 +-----------------------------------
>  5 files changed, 22 insertions(+), 69 deletions(-)
> [2 Digital signature <application/pgp-signature (7bit)>]
>