From mboxrd@z Thu Jan  1 00:00:00 1970
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Subject: Re: ASoC updates for 3.2
Date: Tue, 13 Dec 2011 15:09:23 +0800
Message-ID: <20111213070922.GE7148@opensource.wolfsonmicro.com>
References: <20111213014041.GC15314@opensource.wolfsonmicro.com>
	<s5haa6x6jd1.wl%tiwai@suse.de>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <alsa-devel-bounces@alsa-project.org>
Received: from opensource.wolfsonmicro.com (opensource.wolfsonmicro.com
	[80.75.67.52]) by alsa0.perex.cz (Postfix) with ESMTP id BE3F7103ABB
	for <alsa-devel@alsa-project.org>; Tue, 13 Dec 2011 08:09:28 +0100 (CET)
Content-Disposition: inline
In-Reply-To: <s5haa6x6jd1.wl%tiwai@suse.de>
List-Unsubscribe: <http://mailman.alsa-project.org/mailman/listinfo/alsa-devel>,
	<mailto:alsa-devel-request@alsa-project.org?subject=unsubscribe>
List-Archive: <http://mailman.alsa-project.org/pipermail/alsa-devel>
List-Post: <mailto:alsa-devel@alsa-project.org>
List-Help: <mailto:alsa-devel-request@alsa-project.org?subject=help>
List-Subscribe: <http://mailman.alsa-project.org/mailman/listinfo/alsa-devel>,
	<mailto:alsa-devel-request@alsa-project.org?subject=subscribe>
Sender: alsa-devel-bounces@alsa-project.org
Errors-To: alsa-devel-bounces@alsa-project.org
To: Takashi Iwai <tiwai@suse.de>
Cc: alsa-devel@alsa-project.org, Liam Girdwood <lrg@ti.com>
List-Id: alsa-devel@alsa-project.org

On Tue, Dec 13, 2011 at 08:06:34AM +0100, Takashi Iwai wrote:
> Mark Brown wrote:

> > 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?

I'll send a pull request for my current for-3.3 but note that it might
cause an issue in -next (I think I successfully resolved the issue that
did crop up but ICBW).