Merge remote-tracking branch 'stefanha/trivial-patches' into staging
commit29b18b7a53c0b5053e895947b0b9008120632f9b
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 26 Mar 2012 20:08:26 +0000 (26 15:08 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 26 Mar 2012 20:08:26 +0000 (26 15:08 -0500)
tree6fdaf67eb7584425f45da21a78536b2a836cf9fe
parent3d032f0f5a7968e1721dd6eca00b61ee84510411
parent95b752bc32ccabe48430c0d0062b7c6947d864d0
Merge remote-tracking branch 'stefanha/trivial-patches' into staging

* stefanha/trivial-patches:
  trace-events: Fix broken build caused by wrong format specifier
  test: add test-qmp-commands to make check
  qapi: remove print statements from test-qmp-commands
  test: remove qemu-ga reference
  vl.c: fix '-cpu ?' segfault