Merge remote-tracking branch 'qemu-kvm/uq/master' into staging
commitcab1e8f3e37d8e883c270e3afd9c7c1c18332f0e
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 26 Nov 2012 14:19:45 +0000 (26 08:19 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 26 Nov 2012 14:19:45 +0000 (26 08:19 -0600)
tree7850907f6deee8a04ef68e245c9cb8b4b00d37ba
parent95a6e48d776b208d085854358313346ebdb2924d
parentc6e88b3b27b411e3f1c924deb8b71b20f8a11107
Merge remote-tracking branch 'qemu-kvm/uq/master' into staging

* qemu-kvm/uq/master:
  Legacy qemu-kvm options have no argument

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