Merge remote-tracking branch 'kvm/linux-next'

diff --cc arch/arm/kvm/arm.c
Simple merge

diff --cc arch/powerpc/kvm/book3s_pr.c
Simple merge

diff --cc arch/x86/include/asm/kvm_host.h
Simple merge

diff --cc arch/x86/kvm/x86.c
Simple merge

diff --cc include/linux/kvm_host.h
Simple merge

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