Merge branch 'next/dt-samsung' into next/dt-samsung-new

Conflicts:
	arch/arm/boot/dts/exynos4210-origen.dts
	arch/arm/boot/dts/exynos4210.dtsi
This commit is contained in:
Kukjin Kim 2012-09-22 12:17:37 +09:00
commit a0cabc4017
8 changed files with 527 additions and 297 deletions