[lkml]   [2013]   [Jan]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
SubjectRe: linux-next: manual merge of the samsung tree with the arm-soc tree
Hi Kukjin,

On Wed, 16 Jan 2013 21:13:00 -0800 Kukjin Kim <> 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.

Stephen Rothwell
[unhandled content-type:application/pgp-signature]
 \ /
  Last update: 2013-01-17 07:42    [W:0.046 / U:2.596 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site