From: Anthony Liguori <aliguori@us.ibm.com>
Date: Mon, 17 Sep 2012 15:23:20 +0000 (-0500)
Subject: Merge remote-tracking branch 'kiszka/queues/slirp' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=6b80f7db8a7f84d21e46d01e30c8497733bb23a0;p=qemu.git

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

* kiszka/queues/slirp:
  slirp: Implement TFTP Blocksize option
  slirp: Remove unused return value of tftp_send_next_block
  slirp: Handle more than 65535 blocks in TFTP transfers
  slirp: improve TFTP performance
  slirp: Fix error reported by static code analysis
  slirp: Remove wrong type casts ins debug statements
---

6b80f7db8a7f84d21e46d01e30c8497733bb23a0