diff --git a/[refs] b/[refs]
index 71f0693ce190..acd1965b3595 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 67dbb4ea33731415fe09c62149a34f472719ac1d
+refs/heads/master: 41c0d8680f7f24e1abaaeeabc6723277b2e34b81
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.