From: Anthony Liguori <aliguori@us.ibm.com>
Date: Wed, 22 Aug 2012 18:33:15 +0000 (-0500)
Subject: Merge remote-tracking branch 'qmp/queue/qmp' into staging
X-Git-Tag: v1.2.0-rc1~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=86759aa89d1307d0dda2435cc25943bcd7026686;p=thirdparty%2Fqemu.git

Merge remote-tracking branch 'qmp/queue/qmp' into staging

* qmp/queue/qmp:
  migration: move total_time from ram stats to migration info
  monitor: avoid declaring unused variables
  qapi: Fix memory leak
---

86759aa89d1307d0dda2435cc25943bcd7026686