From: Michael S. Tsirkin <mst@redhat.com>
Date: Mon, 12 Jul 2010 12:13:02 +0000 (+0300)
Subject: Merge branch 'master' into pci
X-Git-Tag: v0.13.0-rc0~25^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d67eb20f6a387a10475b945c9e91fe2a00cffd93;p=thirdparty%2Fqemu.git

Merge branch 'master' into pci
---

d67eb20f6a387a10475b945c9e91fe2a00cffd93