From: Michael S. Tsirkin Date: Wed, 12 Jan 2011 15:39:36 +0000 (+0200) Subject: Merge remote branch 'origin/master' into pci X-Git-Tag: v0.14.0-rc0~109^2~9 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=c2e08bddcd1fa32415c0ee5aa6d3c88a258db4c0;p=users%2Fdwmw2%2Fqemu.git Merge remote branch 'origin/master' into pci --- c2e08bddcd1fa32415c0ee5aa6d3c88a258db4c0