lkml.org 
[lkml]   [2009]   [May]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    From
    Date
    SubjectRE: linux-next: manual merge of the omap tree with the arm tree

    > -----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


    \
     
     \ /
      Last update: 2009-05-28 08:43    [W:0.043 / U:29.972 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site