From: Ingo Molnar <mingo@elte.hu>
Date: Thu, 20 Nov 2008 08:02:39 +0000 (+0100)
Subject: Merge branch 'linus' into x86/uv
X-Git-Tag: v2.6.29-rc1~587^2~4^29~4
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=fbc2a06056c9aa3cb8c44bf1cfeb1d260e229e5c;p=linux-2.6-omap-h63xx.git

Merge branch 'linus' into x86/uv
---

fbc2a06056c9aa3cb8c44bf1cfeb1d260e229e5c
diff --cc arch/x86/kernel/genx2apic_uv_x.c
index d7213a1cb78,2c7dbdb9827..f02bbe5d017
--- a/arch/x86/kernel/genx2apic_uv_x.c
+++ b/arch/x86/kernel/genx2apic_uv_x.c
@@@ -16,12 -15,8 +16,11 @@@
  #include <linux/ctype.h>
  #include <linux/init.h>
  #include <linux/sched.h>
- #include <linux/bootmem.h>
  #include <linux/module.h>
  #include <linux/hardirq.h>
 +#include <linux/timer.h>
 +#include <linux/proc_fs.h>
 +#include <asm/current.h>
  #include <asm/smp.h>
  #include <asm/ipi.h>
  #include <asm/genapic.h>