diff -r 88871c8621b8 -r 6c3e0ce9fc3a config/debug/gdb.in
--- a/config/debug/gdb.in	Thu Feb 17 23:05:34 2011 +0100
+++ b/config/debug/gdb.in	Thu Apr 28 00:21:27 2011 +0200
@@ -8,17 +8,38 @@
 source "config/debug/gdb.in.native"
 source "config/debug/gdb.in.gdbserver"
 
+if GDB_CROSS || GDB_NATIVE || GDB_GDBSERVER
+
+comment "gdb version"
+
+config DEBUG_GDB_SHOW_LINARO
+    bool
+    prompt "Show Linaro versions (EXPERIMENTAL)"
+    depends on EXPERIMENTAL
+    help
+      Linaro is maintaining some advanced/more stable/experimental versions
+      of gdb, especially for the ARM architecture.
+
+      Those versions have not been blessed by the gdb community (nor have they
+      been cursed either!), but they look to be pretty much stable, and even
+      more stable than the upstream versions. YMMV...
+
+      If you do not know what this Linaro stuff is, then simply say 'n' here,
+      and rest in peace. OTOH, if you know what you are doing, you will be
+      able to use and enjoy :-) the Linaro versions by saying 'y' here.
+
+      Linaro: http://www.linaro.org/
+
 choice
     bool
     prompt "gdb version"
-    depends on GDB_CROSS || GDB_NATIVE || GDB_GDBSERVER
 # Don't remove next line
 # CT_INSERT_VERSION_BELOW
 
 config GDB_V_linaro_7_2_2011_02_0
     bool
     prompt "linaro-7.2-2011.02-0 (EXPERIMENTAL)"
-    depends on EXPERIMENTAL
+    depends on DEBUG_GDB_SHOW_LINARO
     select GDB_7_0_or_later
 
 config GDB_V_7_2
@@ -64,3 +85,5 @@
     default "7.0.1" if GDB_V_7_0_1
     default "7.0" if GDB_V_7_0
     default "6.8" if GDB_V_6_8
+
+endif