]> git.proxmox.com Git - mirror_qemu.git/commitdiff
projects / mirror_qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7f67d89 144d192)
Merge remote-tracking branch 'kiszka/queues/slirp' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Tue, 20 Sep 2011 20:18:10 +0000 (15:18 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Tue, 20 Sep 2011 20:18:10 +0000 (15:18 -0500)
1  2 
slirp/tcp_input.c patch | diff1 | diff2 | blob | history

diff --cc slirp/tcp_input.c
Simple merge
QEMU mirror