summary refs log tree commit diff stats
path: root/scripts/qapi-visit.py
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2016-03-16 18:20:10 +0000
committerPeter Maydell <peter.maydell@linaro.org>2016-03-16 18:20:10 +0000
commit33616ace9f3da93cbc967761a173d96eb744fcda (patch)
tree21e3579de84fe610436d6c41f49914e5d16d6111 /scripts/qapi-visit.py
parentd1f8764099022bc1173f2413331b26d4ff609a0c (diff)
parent773460256bb65b7ef5948cedc31aa8bc889ac86f (diff)
downloadfocaccia-qemu-33616ace9f3da93cbc967761a173d96eb744fcda.tar.gz
focaccia-qemu-33616ace9f3da93cbc967761a173d96eb744fcda.zip
Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging
# gpg: Signature made Wed 16 Mar 2016 17:33:44 GMT using RSA key ID C0DE3057
# gpg: Good signature from "Jeffrey Cody <jcody@redhat.com>"
# gpg:                 aka "Jeffrey Cody <jeff@codyprime.org>"
# gpg:                 aka "Jeffrey Cody <codyprime@gmail.com>"

* remotes/cody/tags/block-pull-request:
  MAINTAINERS: Fix typo, block/stream.h -> block/stream.c
  block/sheepdog: fix argument passed to qemu_strtoul()

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'scripts/qapi-visit.py')
0 files changed, 0 insertions, 0 deletions