Skip to content
Commit 6314a17f authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge tag 'tags/for-kvmgt' into HEAD 

The three KVM patches that KVMGT needs.

Conflicts:
	arch/x86/include/asm/kvm_page_track.h
	arch/x86/kvm/mmu.c
parents ad361091 871b7ef2
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