diff options
| author | Peter Maydell | 2017-02-28 14:41:03 +0100 |
|---|---|---|
| committer | Peter Maydell | 2017-02-28 14:41:03 +0100 |
| commit | c8c0a1a784cdf70ecea50e93213137c6c89337a7 (patch) | |
| tree | 3c23f59896f1a706d5a7a6d15ac860abf68f709d /util/qemu-timer.c | |
| parent | Merge remote-tracking branch 'remotes/rth/tags/pull-axp-20170228' into staging (diff) | |
| parent | iscsi: add missing colons to the qapi docs (diff) | |
| download | qemu-c8c0a1a784cdf70ecea50e93213137c6c89337a7.tar.gz qemu-c8c0a1a784cdf70ecea50e93213137c6c89337a7.tar.xz qemu-c8c0a1a784cdf70ecea50e93213137c6c89337a7.zip | |
Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging
# gpg: Signature made Tue 28 Feb 2017 04:34:34 GMT
# gpg: using RSA key 0xBDBE7B27C0DE3057
# gpg: Good signature from "Jeffrey Cody <jcody@redhat.com>"
# gpg: aka "Jeffrey Cody <jeff@codyprime.org>"
# gpg: aka "Jeffrey Cody <codyprime@gmail.com>"
# Primary key fingerprint: 9957 4B4D 3474 90E7 9D98 D624 BDBE 7B27 C0DE 3057
* remotes/cody/tags/block-pull-request:
iscsi: add missing colons to the qapi docs
block/mirror: fix broken sparseness detection
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'util/qemu-timer.c')
0 files changed, 0 insertions, 0 deletions