]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitedb3cf3b34c6777b8e66ba43e8f0526a3cefa943
tree83bb72392d38c59a0eacbcfc7a794332aaed1a53
parente6211a0758e15e21dee17ef440d221611cbdd71f
parenta4a3057895e1dabb4547ddc8583db687444564dd
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