diff --git a/[refs] b/[refs]
index 1edf001e3920..d4df079aaff9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 04cf1440c0fbb320ddea00ef878c7b53c7b7298c
+refs/heads/master: 8dda05ccd8a227e2b56ce6b26d52b1af88437f9e
diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig
index 9c87fd8ed9eb..ca1b6fd94a3f 100644
--- a/trunk/arch/arm/Kconfig
+++ b/trunk/arch/arm/Kconfig
@@ -1005,12 +1005,12 @@ config ARCH_MULTI_V4_V5
 	bool
 
 config ARCH_MULTI_V6
-	bool "ARMv6 based platforms (ARM11, Scorpion, ...)"
+	bool "ARMv6 based platforms (ARM11)"
 	select ARCH_MULTI_V6_V7
 	select CPU_V6
 
 config ARCH_MULTI_V7
-	bool "ARMv7 based platforms (Cortex-A, PJ4, Krait)"
+	bool "ARMv7 based platforms (Cortex-A, PJ4, Scorpion, Krait)"
 	default y
 	select ARCH_MULTI_V6_V7
 	select ARCH_VEXPRESS