Skip to content
Commit bf8bd66d authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'x86/apic' into x86/irq 

Conflicts:
	arch/x86/kernel/apic.c
parents 8ae93669 1ccedb7c
Expand all Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment