Commit 191a6635 authored May 11, 2015 by Ingo Molnar

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>

Some changes are not shown.

For a faster browsing experience, only 20 of 1000+ files are shown. Download one of the files below to see all changes.

Please register or to comment