From: Avi Kivity <avi@redhat.com>
Date: Sun, 1 Nov 2009 11:37:42 +0000 (+0200)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=7173a16ff9b9864666659bd71d0dbbbcb651289b;p=users%2Fdwmw2%2Flinux.git

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

Signed-off-by: Avi Kivity <avi@redhat.com>
---

7173a16ff9b9864666659bd71d0dbbbcb651289b