diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-12-22 12:06:59 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-12-22 12:06:59 +0000 |
| commit | 225adf16d2a128841d76e63248192797e05b712d (patch) | |
| tree | 8187e47e3e982370db0538a2a23666739bdb2d9f /contrib | |
| parent | d1e8e8ecc3d2a1a72504912d671f1cbbac1b06e5 (diff) | |
| parent | 9443598d7e2f2c0a6493d97b3f11dd04837b08e8 (diff) | |
Merge remote-tracking branch 'remotes/thibault/tags/samuel-thibault' into staging
slirp updates
# gpg: Signature made Tue 20 Dec 2016 23:05:13 GMT
# gpg: using RSA key 0xA003196827414880
# gpg: Good signature from "Samuel Thibault <samuel.thibault@gnu.org>"
# gpg: aka "Samuel Thibault <sthibault@debian.org>"
# gpg: aka "Samuel Thibault <samuel.thibault@inria.fr>"
# gpg: aka "Samuel Thibault <samuel.thibault@labri.fr>"
# gpg: aka "Samuel Thibault <samuel.thibault@ens-lyon.org>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg: It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 900C B024 B679 31D4 0F82 304B D017 8C76 7D06 9EE6
# Subkey fingerprint: 6B0F AC21 8566 46E9 4AA2 D200 A003 1968 2741 4880
* remotes/thibault/tags/samuel-thibault:
slirp: support dynamic block size for TFTP transfers
slirp, disas: Replace min/max with MIN/MAX macros
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'contrib')
0 files changed, 0 insertions, 0 deletions