Skip to content
Commit 46f4f0aa authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge branch 'kvm-tsx-ctrl' into HEAD 

Conflicts:
	arch/x86/kvm/vmx/vmx.c
parents 14edff88 b07a5c53
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