From: Anthony Liguori <anthony@codemonkey.ws>
Date: Tue, 17 Sep 2013 15:01:24 +0000 (-0500)
Subject: Merge remote-tracking branch 'kiszka/queues/slirp' into staging
X-Git-Tag: v1.7.0-rc0~112
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=6c2679fc19560699679200fb42ab4659bcbe7f79;hp=-c;p=qemu.git

Merge remote-tracking branch 'kiszka/queues/slirp' into staging

# 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
---

6c2679fc19560699679200fb42ab4659bcbe7f79