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

Mon, 26 Nov 2012 03:19:48 -0800 

Hi Kukjin,

Today's linux-next merge of the samsung tree got a conflict in
arch/arm/boot/dts/exynos5250.dtsi between commit 24025f6f5821 ("Merge
branch 'next/dt-samsung' of
git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into
next/dt") from the arm-soc tree and commit 5d706af5ab0b ("Merge branch
'next/dt-samsung' into for-next") from the samsung tree.

I fixed it up (by using the samsung tree version) and can carry the fix
as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    s...@canb.auug.org.au

Attachment: pgpU7uigJI0mv.pgp
Description: PGP signature

Reply via email to