diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-01-05 08:22:08 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-01-05 08:22:10 -0500 |
| commit | aef1b9cef78ae65c6501850851cc3f61f9be477b (patch) | |
| tree | 9769972983e84620df17c13b73f70a8341c4b125 /Documentation/kernel-parameters.txt | |
| parent | 20c457b8587bee4644d998331d9e13be82e05b4c (diff) | |
| parent | 3c0eee3fe6a3a1c745379547c7e7c904aa64f6d5 (diff) | |
Merge commit 'v2.6.37' into perf/core
Merge reason: Add the final .37 tree.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'Documentation/kernel-parameters.txt')
| -rw-r--r-- | Documentation/kernel-parameters.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 316c723a950c..992cda68fa63 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
| @@ -1751,7 +1751,7 @@ and is between 256 and 4096 characters. It is defined in the file | |||
| 1751 | 1751 | ||
| 1752 | nousb [USB] Disable the USB subsystem | 1752 | nousb [USB] Disable the USB subsystem |
| 1753 | 1753 | ||
| 1754 | nowatchdog [KNL] Disable the lockup detector. | 1754 | nowatchdog [KNL] Disable the lockup detector (NMI watchdog). |
| 1755 | 1755 | ||
| 1756 | nowb [ARM] | 1756 | nowb [ARM] |
| 1757 | 1757 | ||