diff --git a/[refs] b/[refs]
index 7b4c50904b57..12df929f002a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fcd05e15633ebfaaa2a3f26a031a00a6f34d7e2b
+refs/heads/master: 358c14d235b04029a40e208e46a756f8b80996c0
diff --git a/trunk/arch/arm/configs/kzm9g_defconfig b/trunk/arch/arm/configs/kzm9g_defconfig
index 670c3b60f936..84ac68cdf476 100644
--- a/trunk/arch/arm/configs/kzm9g_defconfig
+++ b/trunk/arch/arm/configs/kzm9g_defconfig
@@ -33,7 +33,6 @@ CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
 CONFIG_SMP=y
 CONFIG_SCHED_MC=y
-CONFIG_PREEMPT=y
 CONFIG_AEABI=y
 # CONFIG_OABI_COMPAT is not set
 CONFIG_HIGHMEM=y