[lkml]   [2011]   [Jun]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
SubjectRe: linux-next: manual merge of the security-testing tree with the tree
Hi Uwe,

On Thu, 30 Jun 2011 09:25:59 +0200 Uwe Kleine-König <> 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. :-)

Stephen Rothwell
[unhandled content-type:application/pgp-signature]
 \ /
  Last update: 2011-06-30 11:33    [from the cache]
©2003-2014 Jasper Spaans. hosted at Digital Ocean