From mboxrd@z Thu Jan  1 00:00:00 1970
From: Tomi Valkeinen <tomi.valkeinen@nokia.com>
Subject: Re: linux-next: manual merge of the omap_dss2 tree with the omap
 tree
Date: Tue, 17 Nov 2009 12:00:31 +0200
Message-ID: <1258452031.2419.2.camel@tubuntu.research.nokia.com>
References: <20091116160402.deb0cc82.sfr@canb.auug.org.au>
	 <1258366001.2384.25.camel@tubuntu.research.nokia.com>
	 <20091116183425.GN3684@atomide.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 7bit
Return-path: <linux-kernel-owner+glk-linux-kernel-3=40m.gmane.org-S1754668AbZKQKAr@vger.kernel.org>
In-Reply-To: <20091116183425.GN3684@atomide.com>
Sender: linux-kernel-owner@vger.kernel.org
To: ext Tony Lindgren <tony@atomide.com>
Cc: "linux-next@vger.kernel.org" <linux-next@vger.kernel.org>, "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>, "linux-omap@vger.kernel.org" <linux-omap@vger.kernel.org>, ext Stephen Rothwell <sfr@canb.auug.org.au>
List-Id: linux-omap@vger.kernel.org

On Mon, 2009-11-16 at 19:34 +0100, ext Tony Lindgren wrote:
> Tomi, please update your patch by leaving out the now unnecessary
> TWL4030 and regulator sections. See also the updated version of
> your patch attached.

Thanks, updated. Now I'm able to merge linux-omap/for-next and
dss/for-next without conflicts.

 Tomi