diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-03-01 01:58:38 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-03-01 01:58:38 -0500 |
| commit | 68727fed5469100bec0764207d7efb7a9ecdee29 (patch) | |
| tree | 7afb58ab7665b90122d3b4505be5c6c9f8bade4b /Documentation | |
| parent | dbfedbb98145375106cee7ec7269611d553819dc (diff) | |
| parent | b5b9d6647c1cd5eee90b58941c55f874c2a7e707 (diff) | |
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. | |||
| 1034 | 1034 | ||
| 1035 | nomce [IA-32] Machine Check Exception | 1035 | nomce [IA-32] Machine Check Exception |
| 1036 | 1036 | ||
| 1037 | nomca [IA-64] Disable machine check abort handling | ||
| 1038 | |||
| 1037 | noresidual [PPC] Don't use residual data on PReP machines. | 1039 | noresidual [PPC] Don't use residual data on PReP machines. |
| 1038 | 1040 | ||
| 1039 | noresume [SWSUSP] Disables resume and restores original swap | 1041 | noresume [SWSUSP] Disables resume and restores original swap |