]> git.proxmox.com Git - qemu.git/commitdiff
projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 31e76f6 7bd43ec)
Merge remote-tracking branch 'kiszka/queues/slirp' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Tue, 26 Feb 2013 19:36:09 +0000 (13:36 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Tue, 26 Feb 2013 19:36:09 +0000 (13:36 -0600)
# By Jan Kiszka
# Via Jan Kiszka
* kiszka/queues/slirp:
  slirp: Properly initialize pollfds_idx of new sockets


Trivial merge
Qemu copy for testing