From: Peter Maydell <peter.maydell@linaro.org>
Date: Sat, 31 Mar 2018 07:39:08 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging
X-Git-Tag: v2.12.0-rc2~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b60d667d3d0a9733a42552345b8c37587354f3cd;p=thirdparty%2Fqemu.git

Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging

# gpg: Signature made Fri 30 Mar 2018 04:49:42 BST
# gpg:                using RSA key EF04965B398D6211
# gpg: Good signature from "Jason Wang (Jason Wang on RedHat) <jasowang@redhat.com>"
# 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: 215D 46F4 8246 689E C77F  3562 EF04 965B 398D 6211

* remotes/jasowang/tags/net-pull-request:
  qemu-doc: Rework the network options chapter to make "-net" less prominent

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

b60d667d3d0a9733a42552345b8c37587354f3cd