diff options
| author | Peter Maydell | 2015-10-23 16:55:50 +0200 |
|---|---|---|
| committer | Peter Maydell | 2015-10-23 16:55:50 +0200 |
| commit | 1e700f4c6cddaf29ce1d205f0f8e8b9255481930 (patch) | |
| tree | 1a9c88f0ec27fc95017cda04e701c8016f1a0b08 /include/exec/memory.h | |
| parent | Merge remote-tracking branch 'remotes/dgibson/tags/ppc-next-20151023' into st... (diff) | |
| parent | tests: test-qga, loosen assumptions about host filesystems (diff) | |
| download | qemu-1e700f4c6cddaf29ce1d205f0f8e8b9255481930.tar.gz qemu-1e700f4c6cddaf29ce1d205f0f8e8b9255481930.tar.xz qemu-1e700f4c6cddaf29ce1d205f0f8e8b9255481930.zip | |
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 <flukshun@gmail.com>"
# gpg: aka "Michael Roth <mdroth@utexas.edu>"
# gpg: aka "Michael Roth <mdroth@linux.vnet.ibm.com>"
* remotes/mdroth/tags/qga-pull-2015-10-23-tag:
tests: test-qga, loosen assumptions about host filesystems
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/exec/memory.h')
0 files changed, 0 insertions, 0 deletions