Re: linux-next: manual merge of the samsung tree with the arm-soctree

From: Stephen Rothwell
Date: Thu Jan 17 2013 - 00:59:47 EST


Hi Kukjin,

On Wed, 16 Jan 2013 21:13:00 -0800 Kukjin Kim <kgene.kim@xxxxxxxxxxx> wrote:
>
> One more, following is my preferred resolution when merge conflict happens
> between Samsung tree and arm-soc tree:

Thanks, I will use this resolution tomorrow. You will still get
notification emails just to double check.

--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature