From: Avi Kivity <avi@qumranet.com>
Date: Sun, 18 May 2008 10:55:02 +0000 (+0300)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
X-Git-Tag: kvm-70rc1~32
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=2.6.26-rc2-kvm-00436-gc94c08b;p=users%2Fdwmw2%2Flinux.git

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

c94c08b62166f0fb1063a01bc66f9e9121d06c66