From: Ingo Molnar <mingo@elte.hu>
Date: Tue, 17 Feb 2009 16:20:11 +0000 (+0100)
Subject: Merge branch 'x86/apic' into perfcounters/core
X-Git-Tag: v2.6.31-rc1~383^2~504
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0b6de0092244c98b5ba1abda34c92470a20e0d0c;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'x86/apic' into perfcounters/core

Conflicts:
	arch/x86/kernel/cpu/perfctr-watchdog.c
---

0b6de0092244c98b5ba1abda34c92470a20e0d0c
diff --cc arch/x86/kernel/apic/apic.c
index c9aed4510585f,c12823eb55b59..d1bf032ba26f9
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@@ -34,10 -34,8 +34,9 @@@
  #include <linux/smp.h>
  #include <linux/mm.h>
  
 +#include <asm/perf_counter.h>
  #include <asm/arch_hooks.h>
  #include <asm/pgalloc.h>
- #include <asm/genapic.h>
  #include <asm/atomic.h>
  #include <asm/mpspec.h>
  #include <asm/i8253.h>