diff --git a/[refs] b/[refs]
index c1870f74686c..7a3c20add4e5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 11d5136043424ec6980293210ae774d3ab9646b2
+refs/heads/master: 5de23446300a4b2170efd048ae2ec65022650650
diff --git a/trunk/arch/microblaze/kernel/setup.c b/trunk/arch/microblaze/kernel/setup.c
index acd70fe30a71..1c3f18ba8af1 100644
--- a/trunk/arch/microblaze/kernel/setup.c
+++ b/trunk/arch/microblaze/kernel/setup.c
@@ -58,8 +58,6 @@ void __init setup_arch(char **cmdline_p)
 	__invalidate_dcache_all();
 	__enable_dcache();
 
-	panic_timeout = 120;
-
 	setup_memory();
 
 #if defined(CONFIG_SELFMOD_INTC) || defined(CONFIG_SELFMOD_TIMER)