Hi Uwe, On Thu, 30 Jun 2011 09:25:59 +0200 Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx> 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@xxxxxxxxxxxxxxxx http://www.canb.auug.org.au/~sfr/
Attachment:
pgp5rdQ16YwxI.pgp
Description: PGP signature