diff options
| author | Peter Maydell | 2016-12-22 13:06:59 +0100 |
|---|---|---|
| committer | Peter Maydell | 2016-12-22 13:06:59 +0100 |
| commit | 225adf16d2a128841d76e63248192797e05b712d (patch) | |
| tree | 8187e47e3e982370db0538a2a23666739bdb2d9f /include/exec/cpu-common.h | |
| parent | Merge remote-tracking branch 'remotes/huth/tags/target-dirs-20161220' into st... (diff) | |
| parent | slirp: support dynamic block size for TFTP transfers (diff) | |
| download | qemu-225adf16d2a128841d76e63248192797e05b712d.tar.gz qemu-225adf16d2a128841d76e63248192797e05b712d.tar.xz qemu-225adf16d2a128841d76e63248192797e05b712d.zip | |
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 'include/exec/cpu-common.h')
0 files changed, 0 insertions, 0 deletions