Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / Documentation / kernel-parameters.txt

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index f72ba727441faa8dd6f06ba78931052aeb62a2b5..f20c7abc0329ca520d524a5c135a5597a8484086 100644 (file)
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -1816,6 +1816,8 @@ and is between 256 and 4096 characters. It is defined in the file
 
        nousb           [USB] Disable the USB subsystem
 
+       nowatchdog      [KNL] Disable the lockup detector.
+
        nowb            [ARM]
 
        nox2apic        [X86-64,APIC] Do not enable x2APIC mode.