summary refs log tree commit diff stats
path: root/hw/net/virtio-net.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2019-11-29 11:41:54 +0000
committerPeter Maydell <peter.maydell@linaro.org>2019-11-29 11:41:55 +0000
commitb944295090e9cad3d159dde480ca85756d3c574b (patch)
tree9cca7df07e4a0228ee44beb17b04df83d73bd61c /hw/net/virtio-net.c
parent1a61a081ac33ae6cb7dd2e38d119a572f416c7f7 (diff)
parentbf876a688c9319b506d5ff1175ba7189cd933d91 (diff)
downloadfocaccia-qemu-b944295090e9cad3d159dde480ca85756d3c574b.tar.gz
focaccia-qemu-b944295090e9cad3d159dde480ca85756d3c574b.zip
Merge remote-tracking branch 'remotes/huth-gitlab/tags/pull-request-2019-11-29' into staging
A fix for regression in the s390-ccw bios

# gpg: Signature made Fri 29 Nov 2019 09:26:51 GMT
# gpg:                using RSA key 27B88847EEE0250118F3EAB92ED9D774FE702DB5
# gpg:                issuer "thuth@redhat.com"
# gpg: Good signature from "Thomas Huth <th.huth@gmx.de>" [full]
# gpg:                 aka "Thomas Huth <thuth@redhat.com>" [full]
# gpg:                 aka "Thomas Huth <huth@tuxfamily.org>" [full]
# gpg:                 aka "Thomas Huth <th.huth@posteo.de>" [unknown]
# Primary key fingerprint: 27B8 8847 EEE0 2501 18F3  EAB9 2ED9 D774 FE70 2DB5

* remotes/huth-gitlab/tags/pull-request-2019-11-29:
  pc-bios/s390: Update firmware image with the "fix sclp_get_loadparm_ascii" patch
  pc-bios/s390-ccw: fix sclp_get_loadparm_ascii

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/net/virtio-net.c')
0 files changed, 0 insertions, 0 deletions