From: Avi Kivity <avi@redhat.com>
Date: Fri, 18 Dec 2009 06:23:16 +0000 (+0200)
Subject: Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/torvalds... 
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=0de970e5921bb2c7b566ee1ae3ae50326685409f;p=users%2Fdwmw2%2Flinux.git

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

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>
---

0de970e5921bb2c7b566ee1ae3ae50326685409f