From: Arnd Bergmann Date: Sat, 21 Jul 2012 21:34:38 +0000 (+0200) Subject: Merge branch 'samsung/devel-2' into late/soc X-Git-Tag: v3.6-rc1~64^2 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=537cd80cea370c530d455bc8e00ef0673ba165cb;p=pandora-kernel.git Merge branch 'samsung/devel-2' into late/soc From Kukjin Kim : The updating cpufreq for 1.7GHz of exynos5250 has been included in samsung tree because Rafael thought it was more related in samsung platform and I agreed. And others are adding G2D clock for exynos4x12 Socs. * samsung/devel-2: ARM: S3C64XX: Add header file protection macros in pm-core.h [CPUFREQ] EXYNOS5250: Add support max 1.7GHz for EXYNOS5250 ARM: EXYNOS: Add G2D related clock entries for SMDK4X12 ARM: EXYNOS: Move G2D clock entries to clock-exynos4210.c file Originally from git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git next/devel-samsung-2 but rebased to split out the defconfig changes. Signed-off-by: Arnd Bergmann --- 537cd80cea370c530d455bc8e00ef0673ba165cb Reading git-diff-tree failed