From: Anthony Liguori <aliguori@us.ibm.com>
Date: Tue, 13 Mar 2012 01:48:00 +0000 (-0500)
Subject: Merge remote-tracking branch 'qmp/queue/qmp' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=1d2cb1a2d81af4a760aac18521e11e268ad3711b;p=qemu.git

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

* qmp/queue/qmp:
  qapi-schema.json: fix comment for type ObjectPropretyInfo
  qapi-schema: fix typos and explain 'spice' auth
  qjson.h: include compiler.h for GCC_FMT_ATTR
---

1d2cb1a2d81af4a760aac18521e11e268ad3711b