]> git.proxmox.com Git - qemu.git/commitdiff
projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5dc1119 426e3e6)
Merge remote-tracking branch 'kiszka/queues/slirp' into staging
authorAnthony Liguori <anthony@codemonkey.ws>
Tue, 17 Sep 2013 15:01:24 +0000 (10:01 -0500)
committerAnthony Liguori <anthony@codemonkey.ws>
Tue, 17 Sep 2013 15:01:24 +0000 (10:01 -0500)
# By Liu Ping Fan (3) and Jan Kiszka (1)
# Via Jan Kiszka
* kiszka/queues/slirp:
  slirp: clean up slirp_update_timeout
  slirp: set mainloop timeout with more precise value
  slirp: define timeout as macro
  slirp: make timeout local

Message-id: cover.1379415024.git.jan.kiszka@siemens.com


Trivial merge
Qemu copy for testing