Merge branch 'x86/apic' into perfcounters/core

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

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/kernel/apic/apic.c
index c9aed4510585f9044c86e88fb0d639a52e43eca0,c12823eb55b5974f7facdd040f33c741a8bdad77..d1bf032ba26f9e9527d9da3c5e1caaed27e4e87d
--- 1/arch/x86/kernel/apic.c
--- 2/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>

diff --cc arch/x86/kernel/cpu/common.c
Simple merge

diff --cc arch/x86/kernel/traps.c
Simple merge