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

Merge branch 'x86/x2apic' into irq/sparseirq 



Reason: Avoid conflicts with the x2apic modifications

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parents b683de2b fa47f7e5
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