]> git.proxmox.com Git - qemu.git/commitdiff
projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 46ee77b 1d16252)
Merge remote-tracking branch 'qmp/queue/qmp' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Fri, 30 Nov 2012 16:19:54 +0000 (10:19 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Fri, 30 Nov 2012 16:19:54 +0000 (10:19 -0600)
* qmp/queue/qmp:
  qapi: fix qapi_dealloc_type_size parameter type

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

Trivial merge
Qemu copy for testing