diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-08-30 17:11:14 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-08-30 17:11:14 +0100 |
| commit | 2b294f6b65c7cf1725eeecf97b16024cc565998a (patch) | |
| tree | 6b60765e8527cd3b943fad4c6722b0eb88bb2847 /hw/9pfs | |
| parent | 135a972b45203ba992afc99ef4f061be8a5acae0 (diff) | |
| parent | 336d5881a927cd80e8c0ff61c7f76b1433f91bb0 (diff) | |
| download | qemu-2b294f6b65c7cf1725eeecf97b16024cc565998a.zip qemu-2b294f6b65c7cf1725eeecf97b16024cc565998a.tar.gz qemu-2b294f6b65c7cf1725eeecf97b16024cc565998a.tar.bz2 | |
Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging
* pc-bios/optionrom/Makefile fix for -O0
* revert socket_connect change
# gpg: Signature made Tue 30 Aug 2016 15:36:59 BST
# gpg: using RSA key 0xBFFBD25F78C7AE83
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>"
# gpg: aka "Paolo Bonzini <pbonzini@redhat.com>"
# Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4 E2F7 7E15 100C CD36 69B1
# Subkey fingerprint: F133 3857 4B66 2389 866C 7682 BFFB D25F 78C7 AE83
* remotes/bonzini/tags/for-upstream:
optionrom: cope with multiple -O options
Revert "Change net/socket.c to use socket_*() functions"
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/9pfs')
0 files changed, 0 insertions, 0 deletions