From mboxrd@z Thu Jan  1 00:00:00 1970
From: "Shilimkar, Santosh" <santosh.shilimkar@ti.com>
Subject: RE: linux-next: manual merge of the omap tree with the arm tree
Date: Thu, 28 May 2009 12:10:33 +0530
Message-ID: <EAF47CD23C76F840A9E7FCE10091EFAB02B4BE3967@dbde02.ent.ti.com>
References: <20090528143138.2de9ad37.sfr@canb.auug.org.au>
	<EAF47CD23C76F840A9E7FCE10091EFAB02B4BE3927@dbde02.ent.ti.com>
 <20090528163453.641e5ea3.sfr@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 8BIT
Return-path: <linux-omap-owner@vger.kernel.org>
In-Reply-To: <20090528163453.641e5ea3.sfr@canb.auug.org.au>
Content-Language: en-US
Sender: linux-omap-owner@vger.kernel.org
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Tony Lindgren <tony@atomide.com>, "linux-omap@vger.kernel.org" <linux-omap@vger.kernel.org>, "linux-next@vger.kernel.org" <linux-next@vger.kernel.org>, "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>, Russell King <rmk@arm.linux.org.uk>
List-Id: linux-next.vger.kernel.org


> -----Original Message-----
> From: Stephen Rothwell [mailto:sfr@canb.auug.org.au] 
> Sent: Thursday, May 28, 2009 12:05 PM
> To: Shilimkar, Santosh
> Cc: Tony Lindgren; linux-omap@vger.kernel.org; 
> linux-next@vger.kernel.org; linux-kernel@vger.kernel.org; Russell King
> Subject: Re: linux-next: manual merge of the omap tree with 
> the arm tree
> 
> Hi,
> 
> On Thu, 28 May 2009 11:55:09 +0530 "Shilimkar, Santosh" 
> <santosh.shilimkar@ti.com> wrote:
> >
> > >  +machine-$(CONFIG_ARCH_OMAP2)		:= omap2
> > >  +machine-$(CONFIG_ARCH_OMAP3)		:= omap2
> > > ++machine-$(CONFIG_ARCH_OMAP4)		:= omap2
> > 
> > ++ Is this really ok ?
> 
> Yeah, this is a diff of a git merge.  The ++ just means it 
> was added on
> neither side of the merge - I modified the change from the omap tree
> slightly to fit in better with the cleanups from the arm tree.
Ok. Thanks !!

Regards,
Santosh