diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-03-16 18:20:10 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-03-16 18:20:10 +0000 |
| commit | 33616ace9f3da93cbc967761a173d96eb744fcda (patch) | |
| tree | 21e3579de84fe610436d6c41f49914e5d16d6111 /qapi-schema.json | |
| parent | d1f8764099022bc1173f2413331b26d4ff609a0c (diff) | |
| parent | 773460256bb65b7ef5948cedc31aa8bc889ac86f (diff) | |
| download | qemu-33616ace9f3da93cbc967761a173d96eb744fcda.tar.gz qemu-33616ace9f3da93cbc967761a173d96eb744fcda.tar.bz2 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 'qapi-schema.json')
0 files changed, 0 insertions, 0 deletions