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

Merge branch 'x86/paravirt' into x86/cleanups 



Reason: The setup cleanups conflict with the paravirt cleanups. Avoid
a rather large merge conflict

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