Merge branch 'for-next' of git://github.com/rydberg/linux into next

Pull in changes from Henrik: "a trivial MT documentation fix".

1 files changed, 19 insertions, 19 deletions

diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c
index 80310f7f58d3..55ba46f6207d 100644
--- a/drivers/tty/sysrq.c
+++ b/drivers/tty/sysrq.c
@@ -106,7 +106,7 @@ static void sysrq_handle_SAK(int key)
 }
 static struct sysrq_key_op sysrq_SAK_op = {
         .handler        = sysrq_handle_SAK,
-        .help_msg       = "saK",
+        .help_msg       = "sak(k)",
         .action_msg     = "SAK",
         .enable_mask    = SYSRQ_ENABLE_KEYBOARD,
 };
@@ -122,7 +122,7 @@ static void sysrq_handle_unraw(int key)
 
 static struct sysrq_key_op sysrq_unraw_op = {
         .handler        = sysrq_handle_unraw,
-        .help_msg       = "unRaw",
+        .help_msg       = "unraw(r)",
         .action_msg     = "Keyboard mode set to system default",
         .enable_mask    = SYSRQ_ENABLE_KEYBOARD,
 };
@@ -140,7 +140,7 @@ static void sysrq_handle_crash(int key)
 }
 static struct sysrq_key_op sysrq_crash_op = {
         .handler        = sysrq_handle_crash,
-        .help_msg       = "Crash",
+        .help_msg       = "crash(c)",
         .action_msg     = "Trigger a crash",
         .enable_mask    = SYSRQ_ENABLE_DUMP,
 };
@@ -153,7 +153,7 @@ static void sysrq_handle_reboot(int key)
 }
 static struct sysrq_key_op sysrq_reboot_op = {
         .handler        = sysrq_handle_reboot,
-        .help_msg       = "reBoot",
+        .help_msg       = "reboot(b)",
         .action_msg     = "Resetting",
         .enable_mask    = SYSRQ_ENABLE_BOOT,
 };
@@ -164,7 +164,7 @@ static void sysrq_handle_sync(int key)
 }
 static struct sysrq_key_op sysrq_sync_op = {
         .handler        = sysrq_handle_sync,
-        .help_msg       = "Sync",
+        .help_msg       = "sync(s)",
         .action_msg     = "Emergency Sync",
         .enable_mask    = SYSRQ_ENABLE_SYNC,
 };
@@ -176,7 +176,7 @@ static void sysrq_handle_show_timers(int key)
 
 static struct sysrq_key_op sysrq_show_timers_op = {
         .handler        = sysrq_handle_show_timers,
-        .help_msg       = "show-all-timers(Q)",
+        .help_msg       = "show-all-timers(q)",
         .action_msg     = "Show clockevent devices & pending hrtimers (no others)",
 };
 
@@ -186,7 +186,7 @@ static void sysrq_handle_mountro(int key)
 }
 static struct sysrq_key_op sysrq_mountro_op = {
         .handler        = sysrq_handle_mountro,
-        .help_msg       = "Unmount",
+        .help_msg       = "unmount(u)",
         .action_msg     = "Emergency Remount R/O",
         .enable_mask    = SYSRQ_ENABLE_REMOUNT,
 };
@@ -199,7 +199,7 @@ static void sysrq_handle_showlocks(int key)
 
 static struct sysrq_key_op sysrq_showlocks_op = {
         .handler        = sysrq_handle_showlocks,
-        .help_msg       = "show-all-locks(D)",
+        .help_msg       = "show-all-locks(d)",
         .action_msg     = "Show Locks Held",
 };
 #else
@@ -250,7 +250,7 @@ static void sysrq_handle_showallcpus(int key)
 
 static struct sysrq_key_op sysrq_showallcpus_op = {
         .handler        = sysrq_handle_showallcpus,
-        .help_msg       = "show-backtrace-all-active-cpus(L)",
+        .help_msg       = "show-backtrace-all-active-cpus(l)",
         .action_msg     = "Show backtrace of all active CPUs",
         .enable_mask    = SYSRQ_ENABLE_DUMP,
 };
@@ -265,7 +265,7 @@ static void sysrq_handle_showregs(int key)
 }
 static struct sysrq_key_op sysrq_showregs_op = {
         .handler        = sysrq_handle_showregs,
-        .help_msg       = "show-registers(P)",
+        .help_msg       = "show-registers(p)",
         .action_msg     = "Show Regs",
         .enable_mask    = SYSRQ_ENABLE_DUMP,
 };
@@ -276,7 +276,7 @@ static void sysrq_handle_showstate(int key)
 }
 static struct sysrq_key_op sysrq_showstate_op = {
         .handler        = sysrq_handle_showstate,
-        .help_msg       = "show-task-states(T)",
+        .help_msg       = "show-task-states(t)",
         .action_msg     = "Show State",
         .enable_mask    = SYSRQ_ENABLE_DUMP,
 };
@@ -287,7 +287,7 @@ static void sysrq_handle_showstate_blocked(int key)
 }
 static struct sysrq_key_op sysrq_showstate_blocked_op = {
         .handler        = sysrq_handle_showstate_blocked,
-        .help_msg       = "show-blocked-tasks(W)",
+        .help_msg       = "show-blocked-tasks(w)",
         .action_msg     = "Show Blocked State",
         .enable_mask    = SYSRQ_ENABLE_DUMP,
 };
@@ -301,7 +301,7 @@ static void sysrq_ftrace_dump(int key)
 }
 static struct sysrq_key_op sysrq_ftrace_dump_op = {
         .handler        = sysrq_ftrace_dump,
-        .help_msg       = "dump-ftrace-buffer(Z)",
+        .help_msg       = "dump-ftrace-buffer(z)",
         .action_msg     = "Dump ftrace buffer",
         .enable_mask    = SYSRQ_ENABLE_DUMP,
 };
@@ -315,7 +315,7 @@ static void sysrq_handle_showmem(int key)
 }
 static struct sysrq_key_op sysrq_showmem_op = {
         .handler        = sysrq_handle_showmem,
-        .help_msg       = "show-memory-usage(M)",
+        .help_msg       = "show-memory-usage(m)",
         .action_msg     = "Show Memory",
         .enable_mask    = SYSRQ_ENABLE_DUMP,
 };
@@ -346,7 +346,7 @@ static void sysrq_handle_term(int key)
 }
 static struct sysrq_key_op sysrq_term_op = {
         .handler        = sysrq_handle_term,
-        .help_msg       = "terminate-all-tasks(E)",
+        .help_msg       = "terminate-all-tasks(e)",
         .action_msg     = "Terminate All Tasks",
         .enable_mask    = SYSRQ_ENABLE_SIGNAL,
 };
@@ -365,7 +365,7 @@ static void sysrq_handle_moom(int key)
 }
 static struct sysrq_key_op sysrq_moom_op = {
         .handler        = sysrq_handle_moom,
-        .help_msg       = "memory-full-oom-kill(F)",
+        .help_msg       = "memory-full-oom-kill(f)",
         .action_msg     = "Manual OOM execution",
         .enable_mask    = SYSRQ_ENABLE_SIGNAL,
 };
@@ -377,7 +377,7 @@ static void sysrq_handle_thaw(int key)
 }
 static struct sysrq_key_op sysrq_thaw_op = {
         .handler        = sysrq_handle_thaw,
-        .help_msg       = "thaw-filesystems(J)",
+        .help_msg       = "thaw-filesystems(j)",
         .action_msg     = "Emergency Thaw of all frozen filesystems",
         .enable_mask    = SYSRQ_ENABLE_SIGNAL,
 };
@@ -390,7 +390,7 @@ static void sysrq_handle_kill(int key)
 }
 static struct sysrq_key_op sysrq_kill_op = {
         .handler        = sysrq_handle_kill,
-        .help_msg       = "kill-all-tasks(I)",
+        .help_msg       = "kill-all-tasks(i)",
         .action_msg     = "Kill All Tasks",
         .enable_mask    = SYSRQ_ENABLE_SIGNAL,
 };
@@ -401,7 +401,7 @@ static void sysrq_handle_unrt(int key)
 }
 static struct sysrq_key_op sysrq_unrt_op = {
         .handler        = sysrq_handle_unrt,
-        .help_msg       = "nice-all-RT-tasks(N)",
+        .help_msg       = "nice-all-RT-tasks(n)",
         .action_msg     = "Nice All RT Tasks",
         .enable_mask    = SYSRQ_ENABLE_RTNICE,
 };