]> git.proxmox.com Git - mirror_qemu.git/commitdiff
Merge remote-tracking branch 'remotes/mcayland/tags/qemu-sparc-signed' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Thu, 19 Oct 2017 17:42:51 +0000 (18:42 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Thu, 19 Oct 2017 17:42:51 +0000 (18:42 +0100)
qemu-sparc update

# gpg: Signature made Thu 19 Oct 2017 07:50:16 BST
# gpg:                using RSA key 0x5BC2C56FAE0F321F
# gpg: Good signature from "Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>"
# Primary key fingerprint: CC62 1AB9 8E82 200D 915C  C9C4 5BC2 C56F AE0F 321F

* remotes/mcayland/tags/qemu-sparc-signed:
  sun4u: fix assert when adding NICs which aren't the in-built model
  sun4u: update PCI topology to include simba PCI bridges

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

Trivial merge