From: Peter Maydell <peter.maydell@linaro.org>
Date: Thu, 21 Dec 2017 13:14:06 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/famz/tags/staging-pull-request' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=c3e7267935f27fe5570faffd1483b33be3258653;p=qemu.git

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>
---

c3e7267935f27fe5570faffd1483b33be3258653