From ecf4bd8460f81f3df025a44d7b82312a99f6ca36 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: 145607 b: refs/heads/master c:
 2b2fd87a6ef56ba7647a578e81bb8c8efda166b8 h: refs/heads/master i:   145605:
 8e85622f81fd3a5e0ae1346defb42a76c570608e   145603:
 e977cc1d837842041f4889ec0a8882bb6c86ca90   145599:
 e2c747691925d6e054bfc7ccbccb12d663776ebb v: v3

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

diff --git a/[refs] b/[refs]
index 55a55e734b5a..248f0c0959fc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5043124e660fcc3ddefe4239ddfa017bf13f5081
+refs/heads/master: 2b2fd87a6ef56ba7647a578e81bb8c8efda166b8
diff --git a/trunk/Documentation/kernel-parameters.txt b/trunk/Documentation/kernel-parameters.txt
index 6172e4360f60..33989d284ff0 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.