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.kim at 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                    sfr at canb.auug.org.au
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130117/0cbcdf59/attachment.sig>