Merge branch 'x86/uv' into x86/core

arch/x86/include/asm/apic.h

arch/x86/include/asm/entry_arch.h

arch/x86/include/asm/hardirq.h

arch/x86/include/asm/hw_irq.h

arch/x86/include/asm/irq.h

arch/x86/include/asm/irq_vectors.h

arch/x86/include/asm/uv/uv_hub.h

arch/x86/kernel/Makefile

arch/x86/kernel/entry_64.S

arch/x86/kernel/irq.c

arch/x86/kernel/irqinit_32.c

arch/x86/kernel/irqinit_64.c

arch/x86/kernel/uv_time.c