Messages in this thread |  | | Date | Thu, 17 Jan 2013 16:59:51 +1100 | From | Stephen Rothwell <> | Subject | Re: 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 <kgene.kim@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@canb.auug.org.au [unhandled content-type:application/pgp-signature] |  |