Skip to contentSkip to conversation

ASoC updates for 3.1

DISCUSSION Mark Brown 2 participants 4 messages Oct 4, 2011

lore
Share & tools
lore

Mark Brown

author
#0 lore raw

The following changes since commit 9058020cd9ae3423d6fe7de591698dc96b6701aa:

ASoC: ssm2602: Re-enable oscillator after suspend (2011-09-27 11:20:38 +0100)

are available in the git repository at:
git://opensource.wolfsonmicro.com/linux-2.6-asoc.git for-3.1

None of these should be super critical so no need to rush them out but if there's an opportunity to send stuff they're small, local fixes which are nice to have.

Arnd Bergmann (2):
ASoC: use a valid device for dev_err() in Zylonite
ASoC: omap_mcpdm_remove cannot be __devexit

Axel Lin (1):
ASoC: Fix setting update bits for WM8753_LADC and WM8753_RADC

 sound/soc/codecs/wm8753.c |    4 ++--
 sound/soc/omap/mcpdm.c    |    2 +-
 sound/soc/omap/mcpdm.h    |    2 +-
 sound/soc/pxa/zylonite.c  |    8 ++++----
 4 files changed, 8 insertions(+), 8 deletions(-)
#1 lore raw

At Tue, 4 Oct 2011 14:47:36 +0100,

Quoted 11 lines · Mark Brown

The following changes since commit 9058020cd9ae3423d6fe7de591698dc96b6701aa:

ASoC: ssm2602: Re-enable oscillator after suspend (2011-09-27 11:20:38 +0100)

are available in the git repository at:
git://opensource.wolfsonmicro.com/linux-2.6-asoc.git for-3.1

None of these should be super critical so no need to rush them out but if there's an opportunity to send stuff they're small, local fixes which are nice to have.

This gives a merge conflict with master branch.
Is a merged branch for 3.2 available so that I can avoid possible silly merge mistake?

thanks,

Takashi

Quoted 13 lines

Arnd Bergmann (2):
ASoC: use a valid device for dev_err() in Zylonite
ASoC: omap_mcpdm_remove cannot be __devexit

Axel Lin (1):
ASoC: Fix setting update bits for WM8753_LADC and WM8753_RADC

 sound/soc/codecs/wm8753.c |    4 ++--
 sound/soc/omap/mcpdm.c    |    2 +-
 sound/soc/omap/mcpdm.h    |    2 +-
 sound/soc/pxa/zylonite.c  |    8 ++++----
 4 files changed, 8 insertions(+), 8 deletions(-)
author
#2 lore raw
Quoted 2 lines · Takashi Iwai

Is a merged branch for 3.2 available so that I can avoid possible silly merge mistake?

Yes, I always merge the 3.1 changes up to 3.2 immediately after I commit them - I was just writing the pull request for that while you sent this mail.

#3 lore raw

At Tue, 4 Oct 2011 15:23:06 +0100,

Quoted 9 lines · Mark Brown
Quoted 2 lines · Takashi Iwai

Is a merged branch for 3.2 available so that I can avoid possible silly merge mistake?

Yes, I always merge the 3.1 changes up to 3.2 immediately after I commit them - I was just writing the pull request for that while you sent this mail.

Now I see.

Takashi