From mboxrd@z Thu Jan  1 00:00:00 1970
From: Takashi Iwai <tiwai@suse.de>
Subject: Re: ASoC updates for 2.6.31
Date: Thu, 25 Jun 2009 15:35:56 +0200
Message-ID: <s5h3a9oa11f.wl%tiwai@suse.de>
References: <20090625130939.GA17690@sirena.org.uk>
Mime-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka")
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <alsa-devel-bounces@alsa-project.org>
Received: from mx1.suse.de (cantor.suse.de [195.135.220.2])
	by alsa0.perex.cz (Postfix) with ESMTP id 1ED9C24BBC
	for <alsa-devel@alsa-project.org>;
	Thu, 25 Jun 2009 15:35:57 +0200 (CEST)
In-Reply-To: <20090625130939.GA17690@sirena.org.uk>
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: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: alsa-devel@alsa-project.org
List-Id: alsa-devel@alsa-project.org

At Thu, 25 Jun 2009 14:09:39 +0100,
Mark Brown wrote:
> 
> The following changes since commit 28d0325ce6e0a52f53d8af687e6427fee59004d3:
>   Linus Torvalds (1):
>         Linux 2.6.31-rc1
> 
> are available in the git repository at:
> 
>   ssh://master.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git for-2.6.31

Thanks.  This gave me a merge error (because other entries have been
added to MAINTAINERS) so I corrected manually.

So, I based my 2.6.32 asoc branch on this to avoid the doubly merge
corrections, and I pulled your 2.6.32 branch there, too.

Now everything should be settled doen, you can forward gracefully by
just pulling from my branches :)


Takashi