git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

author	Ingo Molnar <mingo@kernel.org>
	Mon, 11 May 2015 14:05:09 +0000 (16:05 +0200)
committer	Ingo Molnar <mingo@kernel.org>
	Mon, 11 May 2015 14:05:09 +0000 (16:05 +0200)
commit	817c3f3a5500cf6c92227bb1dc622cc193ade199
tree	bd7affc4bc640eb42e5ff3285922497285f8fdd7	tree \| snapshot
parent	03f2689f4b002b9b9612c74a52e89b26fadad4f5	commit \| diff
parent	7565c3ae2cc6498965d4ff41cfcd2931c8109acb	commit \| diff

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>

Linux Kernel Source Tree.

RSS Atom

arch/x86/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/hw_irq.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/irq_vectors.h	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/acpi/boot.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/apic/vector.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/smpboot.c	diff1 \|	diff2 \|	blob \| history
drivers/iommu/intel_irq_remapping.c	diff1 \|	diff2 \|	blob \| history
include/linux/intel-iommu.h	diff1 \|	diff2 \|	blob \| history