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)
commit8e6e2c2ae7a81f625cf1cb320891d5270e277548
tree7aeba6994e047857dbccb3d14f0e67e8015112f5
parent073fd73e566c711f5c0cdaa300fdd1a3c8e7faa0
parentb3dd1b8c295636e64ceb14cdc4db6420d7319e38
Merge remote-tracking branch 'remotes/qmp-unstable/queue/qmp' into staging

* 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>