From: Olof Johansson Date: Thu, 29 May 2014 16:40:51 +0000 (-0700) Subject: Merge tag 'samsung-cleanup' of http://git.kernel.org/pub/scm/linux/kernel/git/kgene... X-Git-Tag: v4.9.8~5950^2~48^2~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a52d35c92d5d3b8890068860838541f7ad55cd29;p=platform%2Fkernel%2Flinux-rpi3.git Merge tag 'samsung-cleanup' of git./linux/kernel/git/kgene/linux-samsung into next/cleanup Merge "Samsung cleanup for v3.16" from Kukjin Kim: - use a common macro v7_exit_coherency_flush macro instead of local function - cleanup mach-exynos/Makefile and remove inclusion plat/cpu.h in mach-exynos - migrate exynos macros from plat-samsung to mach-exynos - cleanup s3c24xx debug macro/earlyprintk to remove arch dependency - fixed compilation error for cpufreq due to moving header in this branch : use of_machine_is_compatible() instead of soc_is_exynos...() Note that based on tags/samsung-clk and tags/samsung-fixes. * tag 'samsung-cleanup' of http://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: cpufreq: exynos: Fix the compile error ARM: S3C24XX: move debug-macro.S into the common space ARM: S3C24XX: use generic DEBUG_UART_PHY/_VIRT in debug macro ARM: S3C24XX: trim down debug uart handling ARM: compressed/head.S: remove s3c24xx special case ARM: EXYNOS: Remove unnecessary inclusion of cpu.h ARM: EXYNOS: Migrate Exynos specific macros from plat to mach ARM: EXYNOS: Remove exynos_subsys registration ARM: EXYNOS: Remove duplicate lines in Makefile ARM: EXYNOS: use v7_exit_coherency_flush macro for cache disabling ARM: dts: Remove g2d_pd node for exynos5420 ARM: dts: Remove mau_pd node for exynos5420 ARM: exynos_defconfig: enable HS-I2C to fix for mmc partition mount ARM: dts: disable MDMA1 node for exynos5420 ARM: EXYNOS: fix the secondary CPU boot of exynos4212 Signed-off-by: Olof Johansson --- a52d35c92d5d3b8890068860838541f7ad55cd29