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 s5p tree
Date: Mon, 5 Dec 2011 10:28:08 +0000
Message-ID: <20111205102807.GA11150@opensource.wolfsonmicro.com>
References: <20111205130102.aec262d85aa6b47b0aec7011@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]:58716 "EHLO
	opensource.wolfsonmicro.com" rhost-flags-OK-OK-OK-OK)
	by vger.kernel.org with ESMTP id S1753683Ab1LEK2L (ORCPT
	<rfc822;linux-next@vger.kernel.org>); Mon, 5 Dec 2011 05:28:11 -0500
Content-Disposition: inline
In-Reply-To: <20111205130102.aec262d85aa6b47b0aec7011@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, Kukjin Kim <kgene.kim@samsung.com>

On Mon, Dec 05, 2011 at 01:01:02PM +1100, Stephen Rothwell wrote:

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

Thanks!