tree d9d0ecd5f3ba50c8d2c93a259c2fd02b6df2beab
parent dcadaa9b40d6019ac18d6fd7763d43048ef79218
parent 4d700430a20b3d53b7b15bc5f6666f7e570e3f2c
author Anthony Liguori <aliguori@us.ibm.com> 1364307945 -0500
committer Anthony Liguori <aliguori@us.ibm.com> 1364307945 -0500

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

# 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