At Tue, 23 Nov 2010 11:06:47 +0000, Liam Girdwood wrote:
Some updates for 2.6.38 too :-
The following changes since commit 33ee617f4dad370bee016e4462e69481257453b0:
Merge remote branch 'tiwai/topic/asoc' into for-2.6.38 (2010-11-03 14:18:42 +0000)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc-2.6.git for-2.6.38
I got a merge conflict, so fixed manually here. Please check whether it's OK for you later.
thanks,
Takashi
Axel Lin (1): ASoC: Move kfree(twl4030) to twl4030_soc_remove()
Jarkko Nikula (3): ASoC: tlv320aic3x: Use gpio_is_valid in checking for valid gpio_reset ASoC: tlv320aic3x: Add support to shared common reset line ASoC: tpa6130a2: Revisit power-up sequence
sound/soc/codecs/tlv320aic3x.c | 32 +++++++++++++++++++++++++++----- sound/soc/codecs/tpa6130a2.c | 6 +++--- sound/soc/codecs/twl4030.c | 6 +++--- 3 files changed, 33 insertions(+), 11 deletions(-)