From 7b1315d25731e923b6d80b465365188caf789552 Mon Sep 17 00:00:00 2001
From: Jiri Kosina <jkosina@suse.cz>
Date: Mon, 16 Aug 2010 17:51:20 +0200
Subject: [PATCH] --- yaml --- r: 215727 b: refs/heads/master c:
 9cf4c4fcb59704f0c50f6aa7933399db5d2edf1a h: refs/heads/master i:   215725:
 ac2c2ecff1d5331634266dcbf2e43891e37eb4b5   215723:
 883e1fc62bae2a26fb52bba5ec7659ccb31f80b8   215719:
 867b32bb6b0fe1d499f57f8936825a236c9410aa   215711:
 6f6dbe27949c7cc9306dd47ff46a3d4e49e97be5 v: v3

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

diff --git a/[refs] b/[refs]
index 56009183ad28..86514e1a0794 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 92f738a52b53dc13b5dd5753634bdb8c59ac9815
+refs/heads/master: 9cf4c4fcb59704f0c50f6aa7933399db5d2edf1a
diff --git a/trunk/Documentation/kernel-parameters.txt b/trunk/Documentation/kernel-parameters.txt
index 8dd7248508a9..6bd23751a2ce 100644
--- a/trunk/Documentation/kernel-parameters.txt
+++ b/trunk/Documentation/kernel-parameters.txt
@@ -1693,6 +1693,8 @@ and is between 256 and 4096 characters. It is defined in the file
 
 	nojitter	[IA64] Disables jitter checking for ITC timers.
 
+	no-kvmclock	[X86,KVM] Disable paravirtualized KVM clock driver
+
 	nolapic		[X86-32,APIC] Do not enable or use the local APIC.
 
 	nolapic_timer	[X86-32,APIC] Do not use the local APIC timer.