From 9e6e6bb8ace92346d56e1964b248ab00153497a7 Mon Sep 17 00:00:00 2001
From: Weidong Han <weidong.han@intel.com>
Date: Fri, 17 Apr 2009 16:42:12 +0800
Subject: [PATCH] --- yaml --- r: 144180 b: refs/heads/master c:
 8b5b94e4e9813cdd77103827f48d58c806ab45c6 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index cbabdfbfdef1..03b935743060 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a81b6314e0aa480b8ac6dd02779d44cd0bee0a34
+refs/heads/master: 8b5b94e4e9813cdd77103827f48d58c806ab45c6
diff --git a/trunk/Documentation/kernel-parameters.txt b/trunk/Documentation/kernel-parameters.txt
index a19f021f081a..9e4fe724c87c 100644
--- a/trunk/Documentation/kernel-parameters.txt
+++ b/trunk/Documentation/kernel-parameters.txt
@@ -1588,6 +1588,8 @@ and is between 256 and 4096 characters. It is defined in the file
 
 	nowb		[ARM]
 
+	nox2apic	[X86-64,APIC] Do not enable x2APIC mode.
+
 	nptcg=		[IA64] Override max number of concurrent global TLB
 			purges which is reported from either PAL_VM_SUMMARY or
 			SAL PALO.