tree ce4a6312d22ba96fe33fd4c5f1f2306807a07422
parent aba8e41e8666e4c0287cef1f6298985d4e03211d
parent 86073017e384b65a4b568da25e5873fd2e5e4db5
author Anthony Liguori <aliguori@us.ibm.com> 1333378005 -0500
committer Anthony Liguori <aliguori@us.ibm.com> 1333378005 -0500

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