Merge branch 'cpuidle/4.4' of http://git.linaro.org/people/daniel.lezcano/linux into...

[deliverable/linux.git] / Documentation / sysrq.txt

diff --git a/Documentation/sysrq.txt b/Documentation/sysrq.txt
index 267f39386f99f77de3993f980652c6b28a7c76d3..13f5619b2203e68af6d766f66a8137dd1133d4fa 100644 (file)
--- a/Documentation/sysrq.txt
+++ b/Documentation/sysrq.txt
@@ -75,7 +75,8 @@ On all -  write a character to /proc/sysrq-trigger.  e.g.:
 
 'e'     - Send a SIGTERM to all processes, except for init.
 
-'f'    - Will call oom_kill to kill a memory hog process.
+'f'    - Will call the oom killer to kill a memory hog process, but do not
+         panic if nothing can be killed.
 
 'g'    - Used by kgdb (kernel debugger)