diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-03-31 11:52:44 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-03-31 11:52:44 +0100 |
| commit | 92741fc4b6cbf7a8f6cce45e9a468d5637a4ff6a (patch) | |
| tree | fec321cdd94ff8b058a6fc949e682a67ab941dc5 /include/standard-headers/linux/virtio_balloon.h | |
| parent | a1a668efd56139e5a14527df958a7f5580299db3 (diff) | |
| parent | 891a2bb58c5c4cbedc82e9606b049bf4c298b88b (diff) | |
| download | qemu-92741fc4b6cbf7a8f6cce45e9a468d5637a4ff6a.zip | |
Merge remote-tracking branch 'remotes/thibault/tags/samuel-thibault' into staging
slirp updates
# gpg: Signature made Thu 31 Mar 2016 00:08:38 BST using RSA key ID FB6B2F1D
# 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: F632 74CD C630 0873 CB3D 29D9 E3E5 1CE8 FB6B 2F1D
* remotes/thibault/tags/samuel-thibault:
Fix ipv6 options according to documentation
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/standard-headers/linux/virtio_balloon.h')
0 files changed, 0 insertions, 0 deletions