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

Merge branch 'linus' into x86/timers 

Pick up upstream changes to avoid conflicts
parents 41afb1df fb7d1bcf
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