Merge branch 'next/dt-samsung' into next/dt-samsung-new
authorKukjin Kim <kgene.kim@samsung.com>
Sat, 22 Sep 2012 03:17:37 +0000 (12:17 +0900)
committerKukjin Kim <kgene.kim@samsung.com>
Sat, 22 Sep 2012 03:17:37 +0000 (12:17 +0900)
commita0cabc4017a78643e26d7bd79bcac548410f0480
tree83bb72392d38c59a0eacbcfc7a794332aaed1a53
parent56952baa9b6f6bc06437abd51baefc4f7c8dee3b
parentc8c24dad2349fb430641535a4f26a7a1cebb9644
Merge branch 'next/dt-samsung' into next/dt-samsung-new

Conflicts:
arch/arm/boot/dts/exynos4210-origen.dts
arch/arm/boot/dts/exynos4210.dtsi
arch/arm/boot/dts/exynos4210-origen.dts
arch/arm/boot/dts/exynos4210.dtsi