]> git.proxmox.com Git - qemu.git/commitdiff
projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dcadaa9 4d70043)
Merge remote-tracking branch 'luiz/queue/qmp' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Tue, 26 Mar 2013 14:25:45 +0000 (09:25 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Tue, 26 Mar 2013 14:25:45 +0000 (09:25 -0500)
# By Corey Bryant (2) and others
# Via Luiz Capitulino
* luiz/queue/qmp:
  New QMP command query-cpu-max and HMP command cpu_max
  qmp: fix handling of boolean values in qmp-shell
  QMP: TPM QMP and man page documentation updates
  QMP: Remove duplicate TPM type from query-tpm


Trivial merge
Qemu copy for testing