summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-03-01 06:58:38 (GMT)
committerJeff Garzik <jeff@garzik.org>2006-03-01 06:58:38 (GMT)
commit68727fed5469100bec0764207d7efb7a9ecdee29 (patch)
tree7afb58ab7665b90122d3b4505be5c6c9f8bade4b /Documentation
parentdbfedbb98145375106cee7ec7269611d553819dc (diff)
parentb5b9d6647c1cd5eee90b58941c55f874c2a7e707 (diff)
downloadlinux-68727fed5469100bec0764207d7efb7a9ecdee29.tar.xz
Merge branch 'upstream-fixes'
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/kernel-parameters.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index b874771..75205391 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -1034,6 +1034,8 @@ running once the system is up.
nomce [IA-32] Machine Check Exception
+ nomca [IA-64] Disable machine check abort handling
+
noresidual [PPC] Don't use residual data on PReP machines.
noresume [SWSUSP] Disables resume and restores original swap