tree 6fdaf67eb7584425f45da21a78536b2a836cf9fe
parent 3d032f0f5a7968e1721dd6eca00b61ee84510411
parent 95b752bc32ccabe48430c0d0062b7c6947d864d0
author Anthony Liguori <aliguori@us.ibm.com> 1332792506 -0500
committer Anthony Liguori <aliguori@us.ibm.com> 1332792506 -0500

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