Skip to content
Commit cb4cfd56 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

Merge branch 'x86/apic' into x86/platform 



Reason: Devicetree based ioapic setup depends on the apic changes.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parents 939d578e abb00522
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment