From mboxrd@z Thu Jan  1 00:00:00 1970
From: Arnd Bergmann <arnd@arndb.de>
Subject: Re: conflicts between omap/cleanup branch and omap_dss2 tree
Date: Thu, 21 Jul 2011 16:20:21 +0200
Message-ID: <201107211620.21138.arnd@arndb.de>
References: <201107172339.32516.arnd@arndb.de> <201107191459.44992.arnd@arndb.de> <1311232784.1874.3.camel@deskari>
Mime-Version: 1.0
Content-Type: Text/Plain;
  charset="utf-8"
Content-Transfer-Encoding: 7bit
Return-path: <linux-omap-owner@vger.kernel.org>
Received: from moutng.kundenserver.de ([212.227.126.186]:55250 "EHLO
	moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1751231Ab1GUOUi (ORCPT
	<rfc822;linux-omap@vger.kernel.org>); Thu, 21 Jul 2011 10:20:38 -0400
In-Reply-To: <1311232784.1874.3.camel@deskari>
Sender: linux-omap-owner@vger.kernel.org
List-Id: linux-omap@vger.kernel.org
To: Tomi Valkeinen <tomi.valkeinen@ti.com>
Cc: Archit Taneja <archit@ti.com>, Tony Lindgren <tony@atomide.com>, Paul Walmsley <paul@pwsan.com>, "linux-arm-kernel@lists.infradead.org" <linux-arm-kernel@lists.infradead.org>, "linux-omap@vger.kernel.org" <linux-omap@vger.kernel.org>, Stephen Rothwell <sfr@canb.auug.org.au>

On Thursday 21 July 2011, Tomi Valkeinen wrote:
> I've pushed a new for-next branch to
> git://gitorious.org/linux-omap-dss2/linux.git for-next. However, I
> decided to just reset it to -rc4 for now.
> 
Ok, thanks!

I've removed the merge with that branch from arm-soc/for-next now.

	Arnd