diff options
| author | Peter Maydell | 2016-08-18 15:42:51 +0200 |
|---|---|---|
| committer | Peter Maydell | 2016-08-18 15:42:51 +0200 |
| commit | 02b1ad881cbb1795029737a9077db60267dc0c6f (patch) | |
| tree | cb957f9d06a1dcd3591dc4a19b03edfe0018ff97 /scripts/switch-timer-api | |
| parent | Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into st... (diff) | |
| parent | block: fix possible reorder of flush operations (diff) | |
| download | qemu-02b1ad881cbb1795029737a9077db60267dc0c6f.tar.gz qemu-02b1ad881cbb1795029737a9077db60267dc0c6f.tar.xz qemu-02b1ad881cbb1795029737a9077db60267dc0c6f.zip | |
Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
# gpg: Signature made Thu 18 Aug 2016 14:39:31 BST
# gpg: using RSA key 0x9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>"
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35 775A 9CA4 ABB3 81AB 73C8
* remotes/stefanha/tags/block-pull-request:
block: fix possible reorder of flush operations
block: fix deadlock in bdrv_co_flush
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'scripts/switch-timer-api')
0 files changed, 0 insertions, 0 deletions