From: Anthony Liguori <aliguori@us.ibm.com>
Date: Mon, 2 Apr 2012 14:46:45 +0000 (-0500)
Subject: Merge remote-tracking branch 'kiszka/queues/slirp' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=cefc898806e0346eef87d15ddaac9475b57b7d84;p=qemu.git

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

* kiszka/queues/slirp:
  slirp: Signal free input buffer space to io-thread
  w32/slirp: Undefine error constants before their redefinition
  slirp: use socket_set_nonblock
  slirp: clean up conflicts with system headers
---

cefc898806e0346eef87d15ddaac9475b57b7d84