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 tree with the arm tree
Date: Tue, 10 Mar 2009 20:04:37 +0000
Message-ID: <20090310200437.GA6959@opensource.wolfsonmicro.com>
References: <20090310144528.0fa208dd.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]:52791 "EHLO
	opensource2.wolfsonmicro.com" rhost-flags-OK-OK-OK-FAIL)
	by vger.kernel.org with ESMTP id S1752539AbZCJUEm (ORCPT
	<rfc822;linux-next@vger.kernel.org>);
	Tue, 10 Mar 2009 16:04:42 -0400
Content-Disposition: inline
In-Reply-To: <20090310144528.0fa208dd.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: Takashi Iwai <tiwai@suse.de>, linux-next@vger.kernel.org, Ben Dooks <ben@simtec.co.uk>, Alexander Schulz <alex@shark-linux.de>, Russell King <rmk@arm.linux.org.uk>

On Tue, Mar 10, 2009 at 02:45:28PM +1100, Stephen Rothwell wrote:

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

I've pushed a patch which should do the equivalent thing to Takashi, it
should hopefully show up in -next soon via his tree.