From: Avi Kivity <avi@qumranet.com>
Date: Fri, 20 Jul 2007 18:22:15 +0000 (+0300)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
X-Git-Tag: kvm-32~8
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=4b087e39892a95a97d7ed29f72a734b194bc5aaa;p=users%2Fdwmw2%2Flinux.git

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

4b087e39892a95a97d7ed29f72a734b194bc5aaa