Merge branch 'linus' into x86/i8259

diff --combined arch/x86/kernel/Makefile
index 2a53ad2cb4504bce9e1eb2546ca8f3cd6ab5302a,77807d4769c99c455237a810fe0edd0f996fb31f..605995e11ea73b0d2db8a9f5be422360e1c350dc
--- 1/arch/x86/kernel/Makefile
--- 2/arch/x86/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
@@@ -18,7 -18,7 +18,7 @@@ CFLAGS_tsc_64.o               := $(nostackp
  obj-y                 := process_$(BITS).o signal_$(BITS).o entry_$(BITS).o
  obj-y                 += traps_$(BITS).o irq_$(BITS).o
  obj-y                 += time_$(BITS).o ioport.o ldt.o
 -obj-y                 += setup_$(BITS).o i8259_$(BITS).o setup.o
 +obj-y                 += setup_$(BITS).o i8259.o irqinit_$(BITS).o setup.o
  obj-$(CONFIG_X86_32)  += sys_i386_32.o i386_ksyms_32.o
  obj-$(CONFIG_X86_64)  += sys_x86_64.o x8664_ksyms_64.o
  obj-$(CONFIG_X86_64)  += syscall_64.o vsyscall_64.o setup64.o
@@@ -82,6 -82,7 +82,7 @@@ obj-$(CONFIG_VMI)             += vmi_32.o vmiclock
  obj-$(CONFIG_KVM_GUEST)               += kvm.o
  obj-$(CONFIG_KVM_CLOCK)               += kvmclock.o
  obj-$(CONFIG_PARAVIRT)                += paravirt.o paravirt_patch_$(BITS).o
+ obj-$(CONFIG_PARAVIRT_CLOCK)  += pvclock.o
  
  obj-$(CONFIG_PCSPKR_PLATFORM) += pcspeaker.o