diff options
author | Len Brown <len.brown@intel.com> | 2009-01-09 03:37:48 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2009-01-09 03:37:48 -0500 |
commit | d0302bc62af7983040ea1cd1b5dd2b36e1a6a509 (patch) | |
tree | ef45618ae057e21fff7c82190939fe5f4466cf06 /Documentation/kernel-parameters.txt | |
parent | 106ad8d6b0a7c1a597fab56ec692c39f553fabbc (diff) | |
parent | 237889bf0a62f1399fb2ba0c2a259e6a96597131 (diff) |
Merge branch 'misc' into release
Conflicts:
include/acpi/acpixf.h
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'Documentation/kernel-parameters.txt')
-rw-r--r-- | Documentation/kernel-parameters.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index c9115c1b672c..136f02842de9 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
@@ -139,6 +139,7 @@ and is between 256 and 4096 characters. It is defined in the file | |||
139 | ht -- run only enough ACPI to enable Hyper Threading | 139 | ht -- run only enough ACPI to enable Hyper Threading |
140 | strict -- Be less tolerant of platforms that are not | 140 | strict -- Be less tolerant of platforms that are not |
141 | strictly ACPI specification compliant. | 141 | strictly ACPI specification compliant. |
142 | rsdt -- prefer RSDT over (default) XSDT | ||
142 | 143 | ||
143 | See also Documentation/power/pm.txt, pci=noacpi | 144 | See also Documentation/power/pm.txt, pci=noacpi |
144 | 145 | ||