From: Anthony Liguori <aliguori@us.ibm.com>
Date: Fri, 30 Nov 2012 16:19:54 +0000 (-0600)
Subject: Merge remote-tracking branch 'qmp/queue/qmp' into staging
X-Git-Tag: qemu-xen-4.3.0-rc1~17^2~7
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=36520faa33abb91b3c8a80e935b82afec78f9bee;p=qemu-upstream-4.4-testing.git

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

* qmp/queue/qmp:
  qapi: fix qapi_dealloc_type_size parameter type

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---

36520faa33abb91b3c8a80e935b82afec78f9bee