]> git.proxmox.com Git - qemu.git/commitdiff
projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b3198cc e3a110b)
Merge remote-tracking branch 'kiszka/queues/slirp' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Fri, 5 Aug 2011 17:17:04 +0000 (12:17 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Fri, 5 Aug 2011 17:17:04 +0000 (12:17 -0500)

Trivial merge
Qemu copy for testing