From 16b657938ea1c893134ea2daf7813f49420dbc21 Mon Sep 17 00:00:00 2001
From: Andi Kleen <andi@firstfloor.org>
Date: Sat, 18 Oct 2008 20:27:27 -0700
Subject: [PATCH] --- yaml --- r: 115889 b: refs/heads/master c:
 2a80a3783d975dadea9740b0ac84c2e8796ee5bb h: refs/heads/master i:   115887:
 c1546c7c127d70db6915a873b9bd91ea0110ca09 v: v3

---
 [refs]                        | 2 +-
 trunk/Documentation/sysrq.txt | 3 ++-
 trunk/drivers/char/sysrq.c    | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 9fc4c5a245d2..cce24098f7b1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 966c8079c0eae66242692184982dc70671dbe90f
+refs/heads/master: 2a80a3783d975dadea9740b0ac84c2e8796ee5bb
diff --git a/trunk/Documentation/sysrq.txt b/trunk/Documentation/sysrq.txt
index 5ce0952aa065..49378a9f2b5f 100644
--- a/trunk/Documentation/sysrq.txt
+++ b/trunk/Documentation/sysrq.txt
@@ -95,7 +95,8 @@ On all -  write a character to /proc/sysrq-trigger.  e.g.:
 
 'p'     - Will dump the current registers and flags to your console.
 
-'q'     - Will dump a list of all running timers.
+'q'     - Will dump a list of all running hrtimers.
+	  WARNING: Does not cover any other timers
 
 'r'     - Turns off keyboard raw mode and sets it to XLATE.
 
diff --git a/trunk/drivers/char/sysrq.c b/trunk/drivers/char/sysrq.c
index dce4cc0e6953..d0c0d64ed366 100644
--- a/trunk/drivers/char/sysrq.c
+++ b/trunk/drivers/char/sysrq.c
@@ -168,7 +168,7 @@ static void sysrq_handle_show_timers(int key, struct tty_struct *tty)
 static struct sysrq_key_op sysrq_show_timers_op = {
 	.handler	= sysrq_handle_show_timers,
 	.help_msg	= "show-all-timers(Q)",
-	.action_msg	= "Show Pending Timers",
+	.action_msg	= "Show pending hrtimers (no others)",
 };
 
 static void sysrq_handle_mountro(int key, struct tty_struct *tty)