diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-05-17 11:59:50 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-05-17 11:59:50 +0100 |
| commit | a4207e3b00e89f934adb231057dcf9a75ac2ae45 (patch) | |
| tree | 6a6c897b5d0ad1c589f37a9d5f7ead52974dea4c /fpu | |
| parent | eb7514ae10d187ccf3bfc0f7dc159a4dfde20be4 (diff) | |
| parent | c82be42cc803b36fd7aed5dceec68312c7056fd5 (diff) | |
Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging
# gpg: Signature made Wed 16 May 2018 18:38:15 BST
# gpg: using RSA key BDBE7B27C0DE3057
# gpg: Good signature from "Jeffrey Cody <jcody@redhat.com>"
# gpg: aka "Jeffrey Cody <jeff@codyprime.org>"
# gpg: aka "Jeffrey Cody <codyprime@gmail.com>"
# Primary key fingerprint: 9957 4B4D 3474 90E7 9D98 D624 BDBE 7B27 C0DE 3057
* remotes/cody/tags/block-pull-request:
nfs: Remove processed options from QDict
nfs: Fix error path in nfs_options_qdict_to_qapi()
blockjob: do not cancel timer in resume
qemu-iotests: reduce chance of races in 185
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'fpu')
0 files changed, 0 insertions, 0 deletions