KVM: Merge remote branch 'origin/master'

Conflicts:

	drivers/kvm/kvm.h
	drivers/kvm/kvm_main.c
	drivers/kvm/mmu.c
	drivers/kvm/svm.c
	drivers/kvm/vmx.c
	drivers/kvm/x86_emulate.c

diff --cc drivers/kvm/kvm_main.c
Simple merge