From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 30 Jun 2011 09:30:23 GMT
Subject: Re: linux-next: manual merge of the security-testing tree with the tree
Message-ID: <20110630193023.6056d48e.sfr@canb.auug.org.au>
In-Reply-To: <20110630072559.GA4048@pengutronix.de>

Hi Uwe,

On Thu, 30 Jun 2011 09:25:59 +0200 Uwe Kleine-König <u.kleine-koenig@pengutronix.de> wrote:
>
> Long history short: James probably used -s ours or similar and it's fine
> not to merge that commit into next :-)

Ah ha!  Thanks for the explanation.  My mind was clearly not up to it
today. :-)

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/