From mboxrd@z Thu Jan  1 00:00:00 1970
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Subject: Re: linux-next: manual merge of the sound-asoc tree with the
 genesis tree
Date: Wed, 15 Sep 2010 10:50:21 +0100
Message-ID: <20100915095021.GB1866@rakim.wolfsonmicro.main>
References: <20100915121128.d8fbc4bb.sfr@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Return-path: <linux-next-owner@vger.kernel.org>
Received: from opensource.wolfsonmicro.com ([80.75.67.52]:34993 "EHLO
	opensource2.wolfsonmicro.com" rhost-flags-OK-OK-OK-FAIL)
	by vger.kernel.org with ESMTP id S1752384Ab0IOJuY (ORCPT
	<rfc822;linux-next@vger.kernel.org>);
	Wed, 15 Sep 2010 05:50:24 -0400
Content-Disposition: inline
In-Reply-To: <20100915121128.d8fbc4bb.sfr@canb.auug.org.au>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Liam Girdwood <lrg@slimlogic.co.uk>, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Guennadi Liakhovetski <g.liakhovetski@gmx.de>, Paul Mundt <lethal@linux-sh.org>, Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

On Wed, Sep 15, 2010 at 12:11:28PM +1000, Stephen Rothwell wrote:

> I fixed it up (I think - see below) and can carry the fix as necessary.

Looks reasonable to me, though Guennadi and Morimoto-san are the experts
here.  Thanks!