diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-03-01 07:58:38 +0100 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-03-01 07:58:38 +0100 |
| commit | 68727fed5469100bec0764207d7efb7a9ecdee29 (patch) | |
| tree | 7afb58ab7665b90122d3b4505be5c6c9f8bade4b /Documentation | |
| parent | Merge branch 'master' (diff) | |
| parent | Merge branch 'e1000' of ssh://198.78.49.142/srv/git/intel/linux-2.6 (diff) | |
| download | linux-68727fed5469100bec0764207d7efb7a9ecdee29.tar.xz linux-68727fed5469100bec0764207d7efb7a9ecdee29.zip | |
Merge branch 'upstream-fixes'
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/kernel-parameters.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index b874771385cd..75205391b335 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 |