Merge branches 'fixes', 'mmci' and 'sa11x0' into for-next

2013-11-12 10:59:08 +00:00
commit 42cbe8271c
--- a/arch/arm/mach-highbank/Kconfig
+++ b/arch/arm/mach-highbank/Kconfig
@@ -9,7 +9,7 @@ config ARCH_HIGHBANK
 	select ARM_AMBA
 	select ARM_ERRATA_764369
 	select ARM_ERRATA_775420
-	select ARM_ERRATA_798181
+	select ARM_ERRATA_798181 if SMP
 	select ARM_GIC
 	select ARM_TIMER_SP804
 	select CACHE_L2X0