]> git.proxmox.com Git - mirror_qemu.git/commitdiff
Merge remote-tracking branch 'kiszka/queues/slirp' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Thu, 29 Sep 2011 18:33:47 +0000 (13:33 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Thu, 29 Sep 2011 18:33:47 +0000 (13:33 -0500)

Trivial merge