From: Avi Kivity <avi@redhat.com>
Date: Sun, 29 Mar 2009 10:24:48 +0000 (+0300)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
X-Git-Tag: kvm-85rc2~4
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=20360ad3e8bf0ce6efae6c78144dd9f8ff739be7;p=users%2Fdwmw2%2Flinux.git

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

20360ad3e8bf0ce6efae6c78144dd9f8ff739be7