From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Tue, 15 Mar 2011 16:32:47 +0000 (+0000)
Subject: Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux... 
X-Git-Tag: upstream/snapshot3+hdmi~11181^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9ced9f03d12d7539e86b0bff5bc750153c976c34;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

Merge branch 'for-rmk' of git://git./linux/kernel/git/kgene/linux-samsung into devel-stable

Conflicts:
	arch/arm/mm/Kconfig
---

9ced9f03d12d7539e86b0bff5bc750153c976c34
diff --cc arch/arm/mm/Kconfig
index 2bd4ccf,0f59e54..c2eafd9
--- a/arch/arm/mm/Kconfig
+++ b/arch/arm/mm/Kconfig
@@@ -811,8 -811,8 +811,8 @@@ config CACHE_FEROCEON_L2_WRITETHROUG
  config CACHE_L2X0
  	bool "Enable the L2x0 outer cache controller"
  	depends on REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || MACH_REALVIEW_PB1176 || \
 -		   REALVIEW_EB_A9MP || ARCH_MX35 || ARCH_MX31 || MACH_REALVIEW_PBX || \
 +		   REALVIEW_EB_A9MP || SOC_IMX35 || SOC_IMX31 || MACH_REALVIEW_PBX || \
- 		   ARCH_NOMADIK || ARCH_OMAP4 || ARCH_S5PV310 || ARCH_TEGRA || \
+ 		   ARCH_NOMADIK || ARCH_OMAP4 || ARCH_EXYNOS4 || ARCH_TEGRA || \
  		   ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || ARCH_SHMOBILE
  	default y
  	select OUTER_CACHE