projects / sdk / emulator / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: aba8e41 8607301)
Merge remote-tracking branch 'kiszka/queues/slirp' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 2 Apr 2012 14:46:45 +0000 (09:46 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 2 Apr 2012 14:46:45 +0000 (09:46 -0500)
* 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


Trivial merge
Domain: SDK / Emulator;