Merge branch 'next/dt-exynos4x12' into next/dt-samsung
authorKukjin Kim <kgene.kim@samsung.com>
Mon, 19 Nov 2012 04:18:47 +0000 (13:18 +0900)
committerKukjin Kim <kgene.kim@samsung.com>
Mon, 19 Nov 2012 04:18:47 +0000 (13:18 +0900)
Conflicts:
arch/arm/boot/dts/exynos4210.dtsi


Trivial merge