[alsa-devel] ASoC updates for 3.2

[Takashi Iwai]

At Tue, 13 Dec 2011 09:40:44 +0800,
Mark Brown wrote:
> 
> The following changes since commit cefcc03ffc9527dde56807339edb1719c8dbae5f:
> 
>   ASoC: Provide a more complete DMA driver stub (2011-12-06 10:05:07 +0000)
> 
> are available in the git repository at:
>   git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-3.2
> 
> The usual story - nothing major fixed here but all small, useful fixes.

I get a merge conflict with master.  Could you give the 3.3-branch
with merge resolves, too?


thanks,

Takashi


> 
> Axel Lin (5):
>       ASoC: Include linux/io.h for jz4740 codec
>       ASoC: Fix build dependency for SND_SOC_JZ4740_CODEC
>       ASoC: Fix a typo in jive_wm8750
>       ASoC: Include linux/module.h for smdk2443_wm9710
>       ASoC: Fix hx4700 error handling to free gpios if snd_soc_register_card fails
> 
> Jonathan Neuschäfer (1):
>       ASoC: WM8958: correctly show firmware magic on mismatch
> 
> Lothar Waßmann (2):
>       ASoC: mxs: Add missing MODULE_LICENSE("GPL")
>       ASoC: mxs: Add appropriate MODULE_ALIAS()
> 
> Mark Brown (1):
>       ASoC: Fix WM8996 24.576MHz clock operation
> 
>  sound/soc/codecs/Kconfig            |    2 +-
>  sound/soc/codecs/jz4740.c           |    1 +
>  sound/soc/codecs/wm8958-dsp2.c      |    2 ++
>  sound/soc/codecs/wm8996.c           |    1 +
>  sound/soc/mxs/mxs-pcm.c             |    3 +++
>  sound/soc/mxs/mxs-sgtl5000.c        |    1 +
>  sound/soc/pxa/hx4700.c              |    5 +++--
>  sound/soc/samsung/jive_wm8750.c     |    3 +--
>  sound/soc/samsung/smdk2443_wm9710.c |    1 +
>  9 files changed, 14 insertions(+), 5 deletions(-)
>