Merge branch 'linus' into x86/apic, to resolve conflicts

Conflicts:
	arch/x86/include/asm/x2apic.h

Signed-off-by: Ingo Molnar <[email protected]>

diff --cc arch/x86/Kconfig
Simple merge

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

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

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

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

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

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

diff --cc arch/x86/include/asm/trace/irq_vectors.h
Simple merge

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

diff --cc arch/x86/kernel/apic/Makefile
Simple merge

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

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

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

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

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

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

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

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

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

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

diff --cc arch/x86/xen/enlighten_pv.c
Simple merge

diff --cc drivers/iommu/amd_iommu.c
Simple merge

diff --cc drivers/iommu/intel_irq_remapping.c
Simple merge

diff --cc drivers/irqchip/irq-gic-v3-its.c
Simple merge

diff --cc include/linux/irq.h
Simple merge

diff --cc include/linux/irqdesc.h
Simple merge

diff --cc include/linux/irqdomain.h
Simple merge

diff --cc include/linux/msi.h
Simple merge

diff --cc kernel/irq/Makefile
Simple merge

diff --cc kernel/irq/autoprobe.c
Simple merge

diff --cc kernel/irq/internals.h
Simple merge