Merge tag 'v4.6-rc1'

[deliverable/linux.git] / kernel / power / poweroff.c

diff --git a/kernel/power/poweroff.c b/kernel/power/poweroff.c
index 68197a4e8fc95e9f9bac2c609d0b69909d8961f2..7ef6866b521d21394e8fe41cf69880864d432992 100644 (file)
--- a/kernel/power/poweroff.c
+++ b/kernel/power/poweroff.c
@@ -32,7 +32,7 @@ static void handle_poweroff(int key)
 
 static struct sysrq_key_op     sysrq_poweroff_op = {
        .handler        = handle_poweroff,
-       .help_msg       = "powerOff",
+       .help_msg       = "poweroff(o)",
        .action_msg     = "Power Off",
        .enable_mask    = SYSRQ_ENABLE_BOOT,
 };