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

Merge branch 'linus' into x86/apic 

Pull in upstream changes to avoid conflicts
parents c948c260 cbfe8fa6
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