diff options
-rw-r--r-- | Documentation/kernel-parameters.txt | 4 | ||||
-rw-r--r-- | MAINTAINERS | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 5dffcfefc3c7..6e9f1dc26884 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
@@ -1160,6 +1160,10 @@ running once the system is up. | |||
1160 | Limit processor to maximum C-state | 1160 | Limit processor to maximum C-state |
1161 | max_cstate=9 overrides any DMI blacklist limit. | 1161 | max_cstate=9 overrides any DMI blacklist limit. |
1162 | 1162 | ||
1163 | processor.nocst [HW,ACPI] | ||
1164 | Ignore the _CST method to determine C-states, | ||
1165 | instead using the legacy FADT method | ||
1166 | |||
1163 | prompt_ramdisk= [RAM] List of RAM disks to prompt for floppy disk | 1167 | prompt_ramdisk= [RAM] List of RAM disks to prompt for floppy disk |
1164 | before loading. | 1168 | before loading. |
1165 | See Documentation/ramdisk.txt. | 1169 | See Documentation/ramdisk.txt. |
diff --git a/MAINTAINERS b/MAINTAINERS index 6af683025ae0..07fd0a23379c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -182,7 +182,7 @@ S: Supported | |||
182 | ACPI | 182 | ACPI |
183 | P: Len Brown | 183 | P: Len Brown |
184 | M: len.brown@intel.com | 184 | M: len.brown@intel.com |
185 | L: acpi-devel@lists.sourceforge.net | 185 | L: linux-acpi@vger.kernel.org |
186 | W: http://acpi.sourceforge.net/ | 186 | W: http://acpi.sourceforge.net/ |
187 | T: git kernel.org:/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git | 187 | T: git kernel.org:/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git |
188 | S: Maintained | 188 | S: Maintained |