| commit | 063833a6ec2a6747e27c5f9866bb44c7e8de1265 | |
| author | Peter Maydell <peter.maydell@linaro.org> | |
| Thu, 19 Oct 2017 17:42:51 +0000 (19 18:42 +0100) | ||
| committer | Peter Maydell <peter.maydell@linaro.org> | |
| Thu, 19 Oct 2017 17:42:51 +0000 (19 18:42 +0100) | ||
| tree | 259d6e4d4f1c48b6bd515a092b5b81cea54d6cd3 | treesnapshot (tar.gz zip) |
| parent | d634fc0499001c5ee49e1004576f9c92ea7c05ff | commitdiff |
| parent | bcf9e2c2f2b7a610efaafc4bd6d0bee9181c2345 | commitdiff |
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 <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>
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>