[alsa-devel] ASoC updates for 2.6.37
The following changes since commit af745bd724e304cc94a88a2fb43d53baffbd63a5:
Merge branch 'for-2.6.37' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc-2.6 into fix/asoc (2010-12-02 17:31:18 +0100)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git for-2.6.37
More small localised fixes.
Axel Lin (1): ASoC: Hold client_mutex while calling snd_soc_instantiate_cards()
Uk Kim (2): ASoC: Fix off by one error in WM8994 EQ register bank size ASoC: Fix swap of left and right channels for WM8993/4 speaker boost gain
include/linux/mfd/wm8994/pdata.h | 2 +- sound/soc/codecs/wm_hubs.c | 2 +- sound/soc/soc-core.c | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-)
At Mon, 6 Dec 2010 14:18:18 +0000, Mark Brown wrote:
The following changes since commit af745bd724e304cc94a88a2fb43d53baffbd63a5:
Merge branch 'for-2.6.37' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc-2.6 into fix/asoc (2010-12-02 17:31:18 +0100)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git for-2.6.37
More small localised fixes.
Pulled now.
This gave a conflict with topic/asoc branch, and so I merged and resolved manually now.
thanks,
Takashi
Axel Lin (1): ASoC: Hold client_mutex while calling snd_soc_instantiate_cards()
Uk Kim (2): ASoC: Fix off by one error in WM8994 EQ register bank size ASoC: Fix swap of left and right channels for WM8993/4 speaker boost gain
include/linux/mfd/wm8994/pdata.h | 2 +- sound/soc/codecs/wm_hubs.c | 2 +- sound/soc/soc-core.c | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-)
On Mon, Dec 06, 2010 at 03:31:56PM +0100, Takashi Iwai wrote:
This gave a conflict with topic/asoc branch, and so I merged and resolved manually now.
I've got a pull request coming right now for the topic/asoc branch which already resolves this :/ Just waiting for kernel.org to mirror it out.
At Mon, 6 Dec 2010 14:33:19 +0000, Mark Brown wrote:
On Mon, Dec 06, 2010 at 03:31:56PM +0100, Takashi Iwai wrote:
This gave a conflict with topic/asoc branch, and so I merged and resolved manually now.
I've got a pull request coming right now for the topic/asoc branch which already resolves this :/ Just waiting for kernel.org to mirror it out.
OK, then I'll revert topic/asoc branch. No big issue :)
Takashi
participants (2)
-
Mark Brown -
Takashi Iwai