From: Peter Maydell Date: Fri, 23 Oct 2015 14:55:50 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/mdroth/tags/qga-pull-2015-10-23-tag' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=1e700f4c6cddaf29ce1d205f0f8e8b9255481930;p=qemu.git Merge remote-tracking branch 'remotes/mdroth/tags/qga-pull-2015-10-23-tag' into staging qemu-ga patch queue * unbreak qga-test unit test on travis-ci systems by not assuming a disk-based filesystem must be present # gpg: Signature made Fri 23 Oct 2015 15:01:47 BST using RSA key ID F108B584 # gpg: Good signature from "Michael Roth " # gpg: aka "Michael Roth " # gpg: aka "Michael Roth " * remotes/mdroth/tags/qga-pull-2015-10-23-tag: tests: test-qga, loosen assumptions about host filesystems Signed-off-by: Peter Maydell --- 1e700f4c6cddaf29ce1d205f0f8e8b9255481930