From 89ae82c3d7bb14b9fd0b743cbc6531f70d3d7aa2 Mon Sep 17 00:00:00 2001
From: Huang Weiyi <weiyi.huang@gmail.com>
Date: Sun, 10 Aug 2008 21:09:22 +0800
Subject: [PATCH] --- yaml --- r: 110348 b: refs/heads/master c:
 8aeb4022633f7d0eca5e13a9622bd73df92bbf2a h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/arch/x86/kernel/cpuid.c | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 32efc0103e71..568de49a1e95 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4c942654a4514d7d0a9b592a7d1b198a212e8a03
+refs/heads/master: 8aeb4022633f7d0eca5e13a9622bd73df92bbf2a
diff --git a/trunk/arch/x86/kernel/cpuid.c b/trunk/arch/x86/kernel/cpuid.c
index 14b11b3be31c..3fa4e926b510 100644
--- a/trunk/arch/x86/kernel/cpuid.c
+++ b/trunk/arch/x86/kernel/cpuid.c
@@ -36,7 +36,6 @@
 #include <linux/smp_lock.h>
 #include <linux/major.h>
 #include <linux/fs.h>
-#include <linux/smp_lock.h>
 #include <linux/device.h>
 #include <linux/cpu.h>
 #include <linux/notifier.h>