Merge branch 'x86/urgent' into x86/core

diff --cc Makefile
Simple merge

diff --cc arch/ia64/include/asm/kvm.h
index 116761c,bfa86b6..2b0a38e
--- 1/arch/ia64/include/asm/kvm.h
--- 2/arch/ia64/include/asm/kvm.h
+++ b/arch/ia64/include/asm/kvm.h
@@@ -21,9 -21,14 +21,13 @@@
   *
   */
  
 -#include <asm/types.h>
 -
 +#include <linux/types.h>
  #include <linux/ioctl.h>
  
+ /* Select x86 specific features in <linux/kvm.h> */
+ #define __KVM_HAVE_IOAPIC
+ #define __KVM_HAVE_DEVICE_ASSIGNMENT
+ 
  /* Architectural interrupt line count. */
  #define KVM_NR_INTERRUPTS 256
  

diff --cc arch/x86/Kconfig.debug
Simple merge

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

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

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

diff --cc arch/x86/mm/numa_64.c
Simple merge

diff --cc kernel/sched.c
Simple merge