Skip to content
Commit 54b56170 authored by H. Peter Anvin's avatar H. Peter Anvin
Browse files

Merge remote branch 'origin/x86/apic' into x86/mrst 

Conflicts:
	arch/x86/kernel/apic/io_apic.c
parents 1f91233c d02e30c3
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment