From: Avi Kivity <avi@redhat.com>
Date: Fri, 27 Mar 2009 09:02:53 +0000 (+0300)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
X-Git-Tag: kvm-85rc2~5
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=86c17509794e841014ee062bb186e1e309e4e69a;p=users%2Fdwmw2%2Flinux.git

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

Conflicts:
	arch/ia64/include/asm/kvm_host.h
	arch/ia64/kvm/kvm-ia64.c
	arch/x86/include/asm/kvm.h
	arch/x86/kvm/i8254.c
	arch/x86/kvm/i8254.h
	arch/x86/kvm/vmx.c
	arch/x86/kvm/x86.c
	include/linux/kvm.h
	include/linux/kvm_host.h
	include/linux/kvm_types.h
	virt/kvm/ioapic.c
	virt/kvm/irq_comm.c
	virt/kvm/kvm_main.c

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

86c17509794e841014ee062bb186e1e309e4e69a