| commit | a0cabc4017a78643e26d7bd79bcac548410f0480 | [log] [tgz] |
|---|---|---|
| author | Kukjin Kim <kgene.kim@samsung.com> | Sat Sep 22 12:17:37 2012 +0900 |
| committer | Kukjin Kim <kgene.kim@samsung.com> | Sat Sep 22 12:17:37 2012 +0900 |
| tree | 83bb72392d38c59a0eacbcfc7a794332aaed1a53 | |
| parent | 56952baa9b6f6bc06437abd51baefc4f7c8dee3b [diff] | |
| parent | c8c24dad2349fb430641535a4f26a7a1cebb9644 [diff] |
Merge branch 'next/dt-samsung' into next/dt-samsung-new Conflicts: arch/arm/boot/dts/exynos4210-origen.dts arch/arm/boot/dts/exynos4210.dtsi