Merge branch 'linus' into x86/uv

diff --cc arch/x86/include/asm/uv/uv_hub.h
Simple merge

diff --cc arch/x86/kernel/genx2apic_uv_x.c
index d7213a1cb784855f27a491dc7887826acde4ca28,2c7dbdb98278316a6fd7228e9a7b2eaf76f58562..f02bbe5d0178d4dc8d7f1e86eb03ad87e7e92807
--- 1/arch/x86/kernel/genx2apic_uv_x.c
--- 2/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>

diff --cc drivers/misc/sgi-xp/xp.h
Simple merge