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
Date: Thu, 16 Jun 2011 11:12:00 +0100
Message-ID: <20110616101200.GA5262@opensource.wolfsonmicro.com>
References: <20110616124055.520eb947.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]:60750 "EHLO
	opensource2.wolfsonmicro.com" rhost-flags-OK-OK-OK-FAIL)
	by vger.kernel.org with ESMTP id S1751715Ab1FPKMD (ORCPT
	<rfc822;linux-next@vger.kernel.org>);
	Thu, 16 Jun 2011 06:12:03 -0400
Content-Disposition: inline
In-Reply-To: <20110616124055.520eb947.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

On Thu, Jun 16, 2011 at 12:40:55PM +1000, Stephen Rothwell wrote:

> Today's linux-next merge of the sound-asoc tree failed badly.  It seems
> that it has been rebased on top of next-20110615.   You cannot base a
> tree in linux-next on linux-next itself!

> I have used the version of the sound-asoc tree from next-20110615 for
> today.

Sorry, pushed the wrong tree to the wrong repository.