diff options
| author | Peter Maydell | 2018-05-18 15:11:51 +0200 |
|---|---|---|
| committer | Peter Maydell | 2018-05-18 15:11:52 +0200 |
| commit | d32e41a1188e929cc0fb16829ce3736046951e39 (patch) | |
| tree | 66b60cd46339a23cd8fb5cc36f52db7135b71028 /target/sparc/cpu.c | |
| parent | Merge remote-tracking branch 'remotes/kraxel/tags/usb-20180518-pull-request' ... (diff) | |
| parent | iothread: fix epollfd leak in the process of delIOThread (diff) | |
| download | qemu-d32e41a1188e929cc0fb16829ce3736046951e39.tar.gz qemu-d32e41a1188e929cc0fb16829ce3736046951e39.tar.xz qemu-d32e41a1188e929cc0fb16829ce3736046951e39.zip | |
Merge remote-tracking branch 'remotes/famz/tags/docker-and-block-pull-request' into staging
Docker and block patches
Two fairly small fixes.
# gpg: Signature made Fri 18 May 2018 10:17:06 BST
# gpg: using RSA key CA35624C6A9171C6
# 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/docker-and-block-pull-request:
iothread: fix epollfd leak in the process of delIOThread
docker: Fix trivial typo
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'target/sparc/cpu.c')
0 files changed, 0 insertions, 0 deletions