]> git.proxmox.com Git - mirror_qemu.git/commitdiff
Merge remote-tracking branch 'amit/master' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Fri, 6 Jan 2012 14:15:39 +0000 (08:15 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Fri, 6 Jan 2012 14:15:39 +0000 (08:15 -0600)
* amit/master:
  virtio-console: Fix failure on unconnected pty


Trivial merge