]> git.ipfire.org Git - thirdparty/qemu.git/commitdiff
Merge remote-tracking branch 'remotes/qmp-unstable/queue/qmp' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Tue, 19 Aug 2014 09:30:36 +0000 (10:30 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Tue, 19 Aug 2014 09:30:36 +0000 (10:30 +0100)
* remotes/qmp-unstable/queue/qmp:
  monitor: fix use after free
  dump.c: Fix memory leak issue in cleanup processing for dump_init()
  monitor: Remove hardcoded watchdog event names

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

Trivial merge