diff --git a/[refs] b/[refs]
index 88833721aab4..0d78bfb116bb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7be138838f2a0c1e1212890481ff9215d3d0fdca
+refs/heads/master: e60cb8a9eb2d76ac072a45112dfaf365837d86aa
diff --git a/trunk/arch/blackfin/Kconfig.debug b/trunk/arch/blackfin/Kconfig.debug
index c8ff41eebc98..5f981d9ca625 100644
--- a/trunk/arch/blackfin/Kconfig.debug
+++ b/trunk/arch/blackfin/Kconfig.debug
@@ -204,11 +204,11 @@ config DEBUG_BFIN_HWTRACE_EXPAND_LEN
 	  4 for (2^4) 16k, or 4096 entries
 
 config DEBUG_BFIN_NO_KERN_HWTRACE
-	bool "Trace user apps (turn off hwtrace in kernel)"
+	bool "Turn off hwtrace in CPLB handlers"
 	depends on DEBUG_BFIN_HWTRACE_ON
-	default n
+	default y
 	help
-	  Some pieces of the kernel contain a lot of flow changes which can
+	  The CPLB error handler contains a lot of flow changes which can
 	  quickly fill up the hardware trace buffer.  When debugging crashes,
 	  the hardware trace may indicate that the problem lies in kernel
 	  space when in reality an application is buggy.