]> git.proxmox.com Git - qemu.git/commitdiff
projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d501f84 917cfc1)
Merge remote-tracking branch 'kiszka/queues/slirp' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Tue, 29 May 2012 09:30:00 +0000 (04:30 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Tue, 29 May 2012 09:30:00 +0000 (04:30 -0500)
* kiszka/queues/slirp:
  slirp: Avoid redefining MAX_TCPOPTLEN
  slirp: Avoid statements without effect on Big Endian host
  slirp: Untangle TCPOLEN_* from TCPOPT_*


Trivial merge
Qemu copy for testing