diff options
| author | Peter Maydell | 2016-10-04 12:01:39 +0200 |
|---|---|---|
| committer | Peter Maydell | 2016-10-04 12:01:39 +0200 |
| commit | d681127d37e192dcf6f15802236d1fbfaf15d682 (patch) | |
| tree | c920b16d392329aff2e2b6567c42e790ed1ecf8e /include/qemu/coroutine_int.h | |
| parent | Merge remote-tracking branch 'remotes/borntraeger/tags/s390x-20160927' into s... (diff) | |
| parent | docker: Build in a clean directory (diff) | |
| download | qemu-d681127d37e192dcf6f15802236d1fbfaf15d682.tar.gz qemu-d681127d37e192dcf6f15802236d1fbfaf15d682.tar.xz qemu-d681127d37e192dcf6f15802236d1fbfaf15d682.zip | |
Merge remote-tracking branch 'remotes/famz/tags/for-upstream' into staging
# gpg: Signature made Sun 02 Oct 2016 02:49:58 BST
# gpg: using RSA key 0xCA35624C6A9171C6
# gpg: Good signature from "Fam Zheng <famz@redhat.com>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 5003 7CB7 9706 0F76 F021 AD56 CA35 624C 6A91 71C6
* remotes/famz/tags/for-upstream:
docker: Build in a clean directory
smbios: fix uuid copy
xenpv: Fix qemu_uuid compiling error
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/qemu/coroutine_int.h')
0 files changed, 0 insertions, 0 deletions