]> Git Repo - qemu.git/commitdiff
Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
authorPeter Maydell <[email protected]>
Fri, 13 Mar 2015 09:54:23 +0000 (09:54 +0000)
committerPeter Maydell <[email protected]>
Fri, 13 Mar 2015 09:54:23 +0000 (09:54 +0000)
# gpg: Signature made Thu Mar 12 19:09:26 2015 GMT using RSA key ID 81AB73C8
# gpg: Good signature from "Stefan Hajnoczi <[email protected]>"
# gpg:                 aka "Stefan Hajnoczi <[email protected]>"

* 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 <[email protected]>

Trivial merge
This page took 0.026102 seconds and 4 git commands to generate.