Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android

diff --git a/linaro/configs/linaro-base.conf b/linaro/configs/linaro-base.conf
index 30670cb62aae7d4a351f1970b2e1a20da4e3374f..34ed2dbd492289e9f60e7eec140c86a50ed9d53e 100644 (file)
--- a/linaro/configs/linaro-base.conf
+++ b/linaro/configs/linaro-base.conf
@@ -94,3 +94,5 @@ CONFIG_ENABLE_DEFAULT_TRACERS=y
 CONFIG_PROC_DEVICETREE=y
 CONFIG_JUMP_LABEL=y
 CONFIG_STRICT_DEVMEM=y
+CONFIG_KGDB=y
+CONFIG_KGDB_TESTS=y