From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Rothwell Subject: Re: linux-next: manual merge of the omap tree with the arm tree Date: Thu, 28 May 2009 16:34:53 +1000 Message-ID: <20090528163453.641e5ea3.sfr@canb.auug.org.au> References: <20090528143138.2de9ad37.sfr@canb.auug.org.au> Mime-Version: 1.0 Content-Type: multipart/signed; protocol="application/pgp-signature"; micalg="PGP-SHA1"; boundary="Signature=_Thu__28_May_2009_16_34_53_+1000_RC6hePVUgMZWjbpL" Return-path: In-Reply-To: Sender: linux-omap-owner@vger.kernel.org To: "Shilimkar, Santosh" Cc: Tony Lindgren , "linux-omap@vger.kernel.org" , "linux-next@vger.kernel.org" , "linux-kernel@vger.kernel.org" , Russell King List-Id: linux-next.vger.kernel.org --Signature=_Thu__28_May_2009_16_34_53_+1000_RC6hePVUgMZWjbpL Content-Type: text/plain; charset=US-ASCII Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi, On Thu, 28 May 2009 11:55:09 +0530 "Shilimkar, Santosh" wrote: > > > +machine-$(CONFIG_ARCH_OMAP2) :=3D omap2 > > +machine-$(CONFIG_ARCH_OMAP3) :=3D omap2 > > ++machine-$(CONFIG_ARCH_OMAP4) :=3D omap2 >=20 > ++ 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. --=20 Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ --Signature=_Thu__28_May_2009_16_34_53_+1000_RC6hePVUgMZWjbpL Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) iEYEARECAAYFAkoeMI0ACgkQjjKRsyhoI8xSlACgrTQSCJW+K1lcThuCVazKDxz/ XyEAoIplKSQcYjez+mHPy44/uM7Rwi9/ =h8Ui -----END PGP SIGNATURE----- --Signature=_Thu__28_May_2009_16_34_53_+1000_RC6hePVUgMZWjbpL--