From: Anthony Liguori <aliguori@us.ibm.com>
Date: Wed, 18 Jul 2012 19:44:37 +0000 (-0500)
Subject: Merge remote-tracking branch 'qmp/queue/qmp' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=513e6bde4fa551c293e7d346e27b618b57a4087a;p=qemu.git

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

* qmp/queue/qmp:
  qapi: Convert getfd and closefd
  qapi: input_type_enum(): fix error message
  qmp: dump-guest-memory: improve schema doc
---

513e6bde4fa551c293e7d346e27b618b57a4087a