diff options
| author | Peter Maydell | 2017-07-25 17:27:54 +0200 |
|---|---|---|
| committer | Peter Maydell | 2017-07-25 17:27:54 +0200 |
| commit | 0f1e9c80941cca7721bf71ab19bf2c06c853169c (patch) | |
| tree | f2f1d7ad1922c1a0d73a1cfd739a5b01a7712bfc /hw/core/ptimer.c | |
| parent | hw/display/sm501: Don't use vmstate_register_ram_global() (diff) | |
| parent | qemu-iotests: Fix reference output for 186 (diff) | |
| download | qemu-0f1e9c80941cca7721bf71ab19bf2c06c853169c.tar.gz qemu-0f1e9c80941cca7721bf71ab19bf2c06c853169c.tar.xz qemu-0f1e9c80941cca7721bf71ab19bf2c06c853169c.zip | |
Merge remote-tracking branch 'remotes/maxreitz/tags/pull-block-2017-07-25' into staging
Block patches for 2.10-rc0
# gpg: Signature made Tue 25 Jul 2017 15:35:12 BST
# gpg: using RSA key 0xF407DB0061D5CF40
# gpg: Good signature from "Max Reitz <mreitz@redhat.com>"
# Primary key fingerprint: 91BE B60A 30DB 3E88 57D1 1829 F407 DB00 61D5 CF40
* remotes/maxreitz/tags/pull-block-2017-07-25:
qemu-iotests: Fix reference output for 186
qcow2-bitmap: fix bitmap_free
qcow: fix memory leaks related to encryption
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/core/ptimer.c')
0 files changed, 0 insertions, 0 deletions