From mboxrd@z Thu Jan  1 00:00:00 1970
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Subject: Re: ASoC updates for 2.6.37
Date: Mon, 6 Dec 2010 14:33:19 +0000
Message-ID: <20101206143319.GF1924@rakim.wolfsonmicro.main>
References: <20101206141817.GE1924@rakim.wolfsonmicro.main>
	<s5h1v5vrmzn.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 opensource2.wolfsonmicro.com (opensource.wolfsonmicro.com
	[80.75.67.52]) by alsa0.perex.cz (Postfix) with ESMTP id 9EE421038C6
	for <alsa-devel@alsa-project.org>; Mon,  6 Dec 2010 15:33:21 +0100 (CET)
Content-Disposition: inline
In-Reply-To: <s5h1v5vrmzn.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@slimlogic.co.uk>
List-Id: alsa-devel@alsa-project.org

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.