Merge branch 'x86/asm' into x86/apic, to resolve a conflict
authorIngo Molnar <mingo@kernel.org>
Mon, 11 May 2015 14:05:09 +0000 (16:05 +0200)
committerIngo Molnar <mingo@kernel.org>
Mon, 11 May 2015 14:05:09 +0000 (16:05 +0200)
commit191a66353b22fad8ac89404ab4c929cbe7b0afb2
treebd7affc4bc640eb42e5ff3285922497285f8fdd7
parentf5d6a52f511157c7476590532a23b5664b1ed877
parentf21262b8e092a770e39fbd405cc18a0247c3af68
Merge branch 'x86/asm' into x86/apic, to resolve a conflict

Conflicts:
arch/x86/kernel/apic/io_apic.c
arch/x86/kernel/apic/vector.c

Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/Kconfig
arch/x86/include/asm/hw_irq.h
arch/x86/include/asm/irq_vectors.h
arch/x86/kernel/acpi/boot.c
arch/x86/kernel/apic/vector.c
arch/x86/kernel/smpboot.c
drivers/iommu/intel_irq_remapping.c
include/linux/intel-iommu.h