Merge remote-tracking branch 'kiszka/queues/slirp' into staging
commit7943df571ae402862a6ace3a2539bd93153317f4
authorAnthony Liguori <aliguori@us.ibm.com>
Tue, 29 May 2012 09:30:00 +0000 (29 04:30 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Tue, 29 May 2012 09:30:00 +0000 (29 04:30 -0500)
tree056387875644bf96cdbdd5d3de331e12ae774a36
parentd501f8478a3c12f50b8cf18214795f3d7c3d94bd
parent917cfc1f266b554ea9ab4d958fa048bd27bce58f
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_*