diff --git a/[refs] b/[refs]
index 5685d2402ce9..0191c4c884a0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 34b133f8e94e39ff3cf4d1c1f67f2e07cdc3d54e
+refs/heads/master: fa188ae1657d6edc7963d524ce9a0650fe725242
diff --git a/trunk/arch/s390/Kconfig b/trunk/arch/s390/Kconfig
index c05d0819f562..ff19efdf6fef 100644
--- a/trunk/arch/s390/Kconfig
+++ b/trunk/arch/s390/Kconfig
@@ -73,7 +73,6 @@ config S390
 	select HAVE_DYNAMIC_FTRACE
 	select HAVE_FUNCTION_GRAPH_TRACER
 	select HAVE_REGS_AND_STACK_ACCESS_API
-	select HAVE_DEFAULT_NO_SPIN_MUTEXES
 	select HAVE_OPROFILE
 	select HAVE_KPROBES
 	select HAVE_KRETPROBES