diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2017-02-02 14:00:10 +0000 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2017-02-02 14:00:10 +0000 |
commit | 53761caf179013650c18d2a8285e7f0548254e78 (patch) | |
tree | a0512808e313511a0b3e3186c22c7abf5683e529 /hw/display/blizzard.c | |
parent | e905587b752a700644235fbbf6af6d21f0632616 (diff) | |
parent | acf6e5f0962c4be670d4a93ede77423512521876 (diff) |
Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging
# gpg: Signature made Wed 01 Feb 2017 05:32:23 GMT
# gpg: using RSA key 0xBDBE7B27C0DE3057
# 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:
sheepdog: reorganize check for overlapping requests
sheepdog: simplify inflight_aio_head management
sheepdog: do not use BlockAIOCB
sheepdog: reorganize coroutine flow
sheepdog: remove unused cancellation support
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/display/blizzard.c')
0 files changed, 0 insertions, 0 deletions