From: Kukjin Kim Date: Sat, 22 Sep 2012 03:17:37 +0000 (+0900) Subject: Merge branch 'next/dt-samsung' into next/dt-samsung-new X-Git-Tag: omap-for-v3.7-rc1/fixes-cpufreq-signed~56^2^2^2~3 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a0cabc4017a78643e26d7bd79bcac548410f0480;p=pandora-kernel.git Merge branch 'next/dt-samsung' into next/dt-samsung-new Conflicts: arch/arm/boot/dts/exynos4210-origen.dts arch/arm/boot/dts/exynos4210.dtsi --- a0cabc4017a78643e26d7bd79bcac548410f0480 Reading git-diff-tree failed