diff --git a/[refs] b/[refs]
index 84791c87a38a..aca595aff238 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 00370b8f8dd6e3171b8202f9c5187a5f73e99497
+refs/heads/master: 3b0eb71ec9e22c6735c84f800d6523c96839efe6
diff --git a/trunk/lib/Kconfig.kgdb b/trunk/lib/Kconfig.kgdb
index 43cb93fa2651..960fa2ecd6e0 100644
--- a/trunk/lib/Kconfig.kgdb
+++ b/trunk/lib/Kconfig.kgdb
@@ -79,4 +79,22 @@ config KDB_KEYBOARD
 	help
 	  KDB can use a PS/2 type keyboard for an input device
 
+config KDB_CONTINUE_CATASTROPHIC
+	int "KDB: continue after catastrophic errors"
+	depends on KGDB_KDB
+	default "0"
+	help
+	  This integer controls the behaviour of kdb when the kernel gets a
+	  catastrophic error, i.e. for a panic or oops.
+	  When KDB is active and a catastrophic error occurs, nothing extra
+	  will happen until you type 'go'.
+	  CONFIG_KDB_CONTINUE_CATASTROPHIC == 0 (default). The first time
+	  you type 'go', you will be warned by kdb. The secend time you type
+	  'go', KDB tries to continue. No guarantees that the
+	  kernel is still usable in this situation.
+	  CONFIG_KDB_CONTINUE_CATASTROPHIC == 1. KDB tries to continue.
+	  No guarantees that the kernel is still usable in this situation.
+	  CONFIG_KDB_CONTINUE_CATASTROPHIC == 2. KDB forces a reboot.
+	  If you are not sure, say 0.
+
 endif # KGDB