diff options
| author | Peter Maydell | 2021-01-06 14:31:11 +0100 |
|---|---|---|
| committer | Peter Maydell | 2021-01-06 14:31:11 +0100 |
| commit | 30918661c17f90ae25a559a91603142f2bcfa34b (patch) | |
| tree | 6a76c22cf81254d35e5b9345e42d16bb7e4da71b /hw/i386 | |
| parent | Merge remote-tracking branch 'remotes/dg-gitlab/tags/ppc-for-6.0-20210106' in... (diff) | |
| parent | sun4m: don't connect two qemu_irqs directly to the same input (diff) | |
| download | qemu-30918661c17f90ae25a559a91603142f2bcfa34b.tar.gz qemu-30918661c17f90ae25a559a91603142f2bcfa34b.tar.xz qemu-30918661c17f90ae25a559a91603142f2bcfa34b.zip | |
Merge remote-tracking branch 'remotes/mcayland/tags/qemu-sparc-20210106' into staging
qemu-sparc queue
# gpg: Signature made Wed 06 Jan 2021 11:43:02 GMT
# gpg: using RSA key CC621AB98E82200D915CC9C45BC2C56FAE0F321F
# gpg: issuer "mark.cave-ayland@ilande.co.uk"
# gpg: Good signature from "Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>" [full]
# Primary key fingerprint: CC62 1AB9 8E82 200D 915C C9C4 5BC2 C56F AE0F 321F
* remotes/mcayland/tags/qemu-sparc-20210106:
sun4m: don't connect two qemu_irqs directly to the same input
include/hw/sparc/grlib.h: Remove unused set_pil_in_fn typedef
hw/sparc: Make grlib-irqmp device handle its own inbound IRQ lines
hw/timer/slavio_timer: Allow 64-bit accesses
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/i386')
0 files changed, 0 insertions, 0 deletions