From: Peter Maydell Date: Thu, 19 Oct 2017 17:42:51 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/mcayland/tags/qemu-sparc-signed' into staging X-Git-Tag: v2.11.0-rc0~38 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=063833a6ec2a6747e27c5f9866bb44c7e8de1265;p=thirdparty%2Fqemu.git Merge remote-tracking branch 'remotes/mcayland/tags/qemu-sparc-signed' into staging 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 " # 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 --- 063833a6ec2a6747e27c5f9866bb44c7e8de1265