diff options
author | Peter Maydell | 2017-12-21 14:14:06 +0100 |
---|---|---|
committer | Peter Maydell | 2017-12-21 14:14:06 +0100 |
commit | c3e7267935f27fe5570faffd1483b33be3258653 (patch) | |
tree | f38b876b0b160afdc63756c3e7675e2e728ad0fd /scsi/qemu-pr-helper.c | |
parent | Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2017-12-20' into ... (diff) | |
parent | util: add is_equal to UUID API (diff) | |
download | qemu-c3e7267935f27fe5570faffd1483b33be3258653.tar.gz qemu-c3e7267935f27fe5570faffd1483b33be3258653.tar.xz qemu-c3e7267935f27fe5570faffd1483b33be3258653.zip |
Merge remote-tracking branch 'remotes/famz/tags/staging-pull-request' into staging
# gpg: Signature made Thu 21 Dec 2017 01:51:20 GMT
# gpg: using RSA key 0xCA35624C6A9171C6
# gpg: Good signature from "Fam Zheng <famz@redhat.com>"
# Primary key fingerprint: 5003 7CB7 9706 0F76 F021 AD56 CA35 624C 6A91 71C6
* remotes/famz/tags/staging-pull-request:
util: add is_equal to UUID API
Revert "docker: Enable features explicitly in test-full"
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'scsi/qemu-pr-helper.c')
0 files changed, 0 insertions, 0 deletions