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)
Conflicts:
arch/arm/boot/dts/exynos4210-origen.dts
arch/arm/boot/dts/exynos4210.dtsi


Trivial merge