summary refs log tree commit diff stats
path: root/linux-user/signal.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2018-03-31 08:39:08 +0100
committerPeter Maydell <peter.maydell@linaro.org>2018-03-31 08:39:08 +0100
commitb60d667d3d0a9733a42552345b8c37587354f3cd (patch)
tree5d6834eccc30c160b769aa5da11e179589330934 /linux-user/signal.c
parenteae3aace85eabdeb610c154914344d52f13b3540 (diff)
parentabbbb0350d780e24d2f6a0cf8fc3191badb0329a (diff)
downloadfocaccia-qemu-b60d667d3d0a9733a42552345b8c37587354f3cd.tar.gz
focaccia-qemu-b60d667d3d0a9733a42552345b8c37587354f3cd.zip
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>
Diffstat (limited to 'linux-user/signal.c')
0 files changed, 0 insertions, 0 deletions