From mboxrd@z Thu Jan 1 00:00:00 1970 From: Takashi Iwai Subject: Re: ASoC updates for 3.1 Date: Tue, 04 Oct 2011 16:11:37 +0200 Message-ID: References: <20111004134736.GD6934@opensource.wolfsonmicro.com> Mime-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mx2.suse.de (cantor2.suse.de [195.135.220.15]) by alsa0.perex.cz (Postfix) with ESMTP id B19852463C for ; Tue, 4 Oct 2011 16:11:38 +0200 (CEST) In-Reply-To: <20111004134736.GD6934@opensource.wolfsonmicro.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: alsa-devel-bounces@alsa-project.org Errors-To: alsa-devel-bounces@alsa-project.org To: Mark Brown Cc: alsa-devel@alsa-project.org, Liam Girdwood List-Id: alsa-devel@alsa-project.org At Tue, 4 Oct 2011 14:47:36 +0100, Mark Brown wrote: > > 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 > 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(-) >