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

[Stephen Rothwell]

Hi Kukjin,

On Wed, 16 Jan 2013 21:13:00 -0800 Kukjin Kim <kgene....@samsung.com> 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                    s...@canb.auug.org.au

pgpOeNP6hfLvN.pgp
Description: PGP signature