From: Anthony Liguori <aliguori@us.ibm.com>
Date: Tue, 29 May 2012 09:30:00 +0000 (-0500)
Subject: Merge remote-tracking branch 'kiszka/queues/slirp' into staging
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=7943df571ae402862a6ace3a2539bd93153317f4;p=qmiga%2Fqemu.git

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

* kiszka/queues/slirp:
  slirp: Avoid redefining MAX_TCPOPTLEN
  slirp: Avoid statements without effect on Big Endian host
  slirp: Untangle TCPOLEN_* from TCPOPT_*
---

7943df571ae402862a6ace3a2539bd93153317f4