From: Anthony Liguori <aliguori@us.ibm.com>
Date: Tue, 13 Mar 2012 18:56:13 +0000 (-0500)
Subject: Merge remote-tracking branch 'kiszka/queues/slirp' into staging
X-Git-Tag: v1.1-rc0~234
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3e7ecd976b06fc9054a34bda093a70efae99588b;p=thirdparty%2Fqemu.git

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

* kiszka/queues/slirp:
  slirp: Fix compiler warning for w64
  slirp: Cleanup resources on instance removal
  slirp: Remove unneeded if_queued
  slirp: Fix queue walking in if_start
  slirp: Prevent recursion of if_start
  slirp: Keep next_m always valid
---

3e7ecd976b06fc9054a34bda093a70efae99588b