From: Avi Kivity <avi@redhat.com>
Date: Wed, 18 Feb 2009 11:06:46 +0000 (+0000)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
X-Git-Tag: kvm-85rc1~57
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=7122d897538d22039cd8f46ff8ac6aef12430ee2;p=users%2Fdwmw2%2Flinux.git

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

Conflicts:
	arch/x86/include/asm/kvm.h

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

7122d897538d22039cd8f46ff8ac6aef12430ee2