From 06099e4df847304ed04ddd9c0b15154579855c6f Mon Sep 17 00:00:00 2001
From: Len Brown <len.brown@intel.com>
Date: Wed, 28 Dec 2005 23:43:17 -0500
Subject: [PATCH] --- yaml --- r: 15347 b: refs/heads/master c:
 0a5296dc34593e08c9e54b60e8f93684efff2f92 h: refs/heads/master i:   15345:
 3f1af5e1e75b3685de967c6904e5faab2ef17a4b   15343:
 a9d413519a19be5befbbf031fc33367fb0e735b5 v: v3

---
 [refs]                                    | 2 +-
 trunk/Documentation/kernel-parameters.txt | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 9326de18ed28..e31f78a4bc05 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3603bc8dc5ab33941e6378fe52ea03b7f5561109
+refs/heads/master: 0a5296dc34593e08c9e54b60e8f93684efff2f92
diff --git a/trunk/Documentation/kernel-parameters.txt b/trunk/Documentation/kernel-parameters.txt
index 5dffcfefc3c7..6e9f1dc26884 100644
--- a/trunk/Documentation/kernel-parameters.txt
+++ b/trunk/Documentation/kernel-parameters.txt
@@ -1160,6 +1160,10 @@ running once the system is up.
 			Limit processor to maximum C-state
 			max_cstate=9 overrides any DMI blacklist limit.
 
+	processor.nocst	[HW,ACPI]
+			Ignore the _CST method to determine C-states,
+			instead using the legacy FADT method
+
 	prompt_ramdisk=	[RAM] List of RAM disks to prompt for floppy disk
 			before loading.
 			See Documentation/ramdisk.txt.