From: Avi Kivity <avi@redhat.com>
Date: Mon, 15 Dec 2008 10:10:58 +0000 (+0200)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
X-Git-Tag: kvm-82rc1~30
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=f320f52e87a554cf6eed69c3c19180bb28dd0a33;p=users%2Fdwmw2%2Flinux.git

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

f320f52e87a554cf6eed69c3c19180bb28dd0a33