tree bd7affc4bc640eb42e5ff3285922497285f8fdd7
parent f5d6a52f511157c7476590532a23b5664b1ed877
parent f21262b8e092a770e39fbd405cc18a0247c3af68
author Ingo Molnar <mingo@kernel.org> 1431353109 +0200
committer Ingo Molnar <mingo@kernel.org> 1431353109 +0200

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>