]> xenbits.xensource.com Git - qemu-upstream-4.4-testing.git/commitdiff
Merge remote-tracking branch 'qemu-kvm/uq/master' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 26 Nov 2012 14:19:45 +0000 (08:19 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 26 Nov 2012 14:19:45 +0000 (08:19 -0600)
* qemu-kvm/uq/master:
  Legacy qemu-kvm options have no argument

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

Trivial merge