Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/torvalds...

Conflicts:
	Documentation/kvm/api.txt
	arch/x86/include/asm/kvm.h
	arch/x86/include/asm/vmx.h
	arch/x86/kvm/svm.c
	arch/x86/kvm/vmx.c
	arch/x86/kvm/x86.c
	include/linux/kvm.h
	virt/kvm/assigned-dev.c

Signed-off-by: Avi Kivity <avi@redhat.com>

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

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