From: Avi Kivity <avi@qumranet.com>
Date: Thu, 26 Jul 2007 05:27: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-34~31
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=6e6869e5d62537133938f31117274b96735aa447;p=users%2Fdwmw2%2Flinux.git

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

Conflicts:

	drivers/kvm/kvm_main.c
---

6e6869e5d62537133938f31117274b96735aa447