| commit | 229c0372cf3ca201c41d2bb121627e6752e776ad | |
| author | Peter Maydell <peter.maydell@linaro.org> | |
| Tue, 24 Nov 2015 10:27:19 +0000 (24 10:27 +0000) | ||
| committer | Peter Maydell <peter.maydell@linaro.org> | |
| Tue, 24 Nov 2015 10:27:19 +0000 (24 10:27 +0000) | ||
| tree | 3e174681776a6d36a270ddfc6fa004b055971c9c | treesnapshot (tar.gz zip) |
| parent | 5522a841cab5f15ac0f8d207b320c21755a7a1a5 | commitdiff |
| parent | 466138dc689b6b14f31d5d20316affb4b4efd177 | commitdiff |
Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
# gpg: Signature made Tue 24 Nov 2015 08:04:07 GMT using RSA key ID 81AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>"
* remotes/stefanha/tags/block-pull-request:
virtio-blk: Move resetting of req->mr_next to virtio_blk_handle_rw_error
parallels: dirty BAT properly for continuous allocations
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
# gpg: Signature made Tue 24 Nov 2015 08:04:07 GMT using RSA key ID 81AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>"
* remotes/stefanha/tags/block-pull-request:
virtio-blk: Move resetting of req->mr_next to virtio_blk_handle_rw_error
parallels: dirty BAT properly for continuous allocations
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>