| commit | f9f141b7475acfed1b6a28809687109702295be3 | |
| author | Peter Maydell <peter.maydell@linaro.org> | |
| Fri, 13 Mar 2015 09:54:23 +0000 (13 09:54 +0000) | ||
| committer | Peter Maydell <peter.maydell@linaro.org> | |
| Fri, 13 Mar 2015 09:54:23 +0000 (13 09:54 +0000) | ||
| tree | b8885cb668b93775edddf18682e8f89d33d3bf72 | treesnapshot (tar.gz zip) |
| parent | 2a5b58e2405e9fe42ba356b5a1b78146a4e9a659 | commitdiff |
| parent | 87b86e7ef29771a7fa06e3e8e88fa95bbc13a39c | commitdiff |
Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
# gpg: Signature made Thu Mar 12 19:09:26 2015 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:
qcow2: fix the macro QCOW_MAX_L1_SIZE's use
queue: fix QSLIST_INSERT_HEAD_ATOMIC race
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
# gpg: Signature made Thu Mar 12 19:09:26 2015 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:
qcow2: fix the macro QCOW_MAX_L1_SIZE's use
queue: fix QSLIST_INSERT_HEAD_ATOMIC race
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>