From: Avi Kivity <avi@qumranet.com>
Date: Wed, 25 Jul 2007 12:14:55 +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~33
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=1401d87992e8a63d6f4b74b899e94605813f4c08;p=users%2Fdwmw2%2Flinux.git

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

1401d87992e8a63d6f4b74b899e94605813f4c08