From: Peter Maydell <peter.maydell@linaro.org>
Date: Tue, 30 Aug 2016 16:11:14 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging
X-Git-Tag: v2.7.0-rc5~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2b294f6b65c7cf1725eeecf97b16024cc565998a;p=thirdparty%2Fqemu.git

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>
---

2b294f6b65c7cf1725eeecf97b16024cc565998a