From 967c097a12a107a21e854816bb8a4cdf42fbeac5 Mon Sep 17 00:00:00 2001
From: Stephen Boyd <sboyd@codeaurora.org>
Date: Sat, 13 Aug 2011 12:34:50 -0700
Subject: [PATCH] --- yaml --- r: 262934 b: refs/heads/master c:
 ac1667db056a323cb0cb5d75e3bdb820804d46b6 h: refs/heads/master v: v3

---
 [refs]                                    |  2 +-
 trunk/Documentation/kernel-parameters.txt | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 0c82164460af..9d1199825a36 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3c8429ad574f2d83878438522f41c003a6cc458e
+refs/heads/master: ac1667db056a323cb0cb5d75e3bdb820804d46b6
diff --git a/trunk/Documentation/kernel-parameters.txt b/trunk/Documentation/kernel-parameters.txt
index 78926aa2531c..246b132dcc90 100644
--- a/trunk/Documentation/kernel-parameters.txt
+++ b/trunk/Documentation/kernel-parameters.txt
@@ -2635,6 +2635,16 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
 					medium is write-protected).
 			Example: quirks=0419:aaf5:rl,0421:0433:rc
 
+	user_debug=	[KNL,ARM]
+			Format: <int>
+			See arch/arm/Kconfig.debug help text.
+				 1 - undefined instruction events
+				 2 - system calls
+				 4 - invalid data aborts
+				 8 - SIGSEGV faults
+				16 - SIGBUS faults
+			Example: user_debug=31
+
 	userpte=
 			[X86] Flags controlling user PTE allocations.