diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2020-02-28 11:19:48 +0000 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2020-02-28 11:19:48 +0000 |
commit | c12d4b60be782d86faefcc22dc62632b8a3e449e (patch) | |
tree | 2cf49631815eb65ef18bc542ea07214ab647b20b /MAINTAINERS | |
parent | 4ae046b8314de2245218032c8b234c6fdb50478d (diff) | |
parent | 0484d9d4fbe9beacd3dd36fdf7fc3e14940bf078 (diff) |
Merge remote-tracking branch 'remotes/amarkovic/tags/mips-queue-feb-27-2020' into staging
MIPS queue for February 27th, 2020
# gpg: Signature made Thu 27 Feb 2020 13:20:55 GMT
# gpg: using RSA key D4972A8967F75A65
# gpg: Good signature from "Aleksandar Markovic <amarkovic@wavecomp.com>" [full]
# Primary key fingerprint: 8526 FBF1 5DA3 811F 4A01 DD75 D497 2A89 67F7 5A65
* remotes/amarkovic/tags/mips-queue-feb-27-2020:
tests/acceptance: Count multiple Tux logos displayed on framebuffer
hw/mips: Use memory_region_init_rom() with read-only regions
hw/mips/mips_int: Simplify cpu_mips_irq_init_cpu()
MAINTAINERS: Reactivate MIPS KVM CPUs
MAINTAINERS: Orphan MIPS KVM CPUs
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 0acb16cd1b..b66c46dcb9 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -365,9 +365,8 @@ S: Maintained F: target/arm/kvm.c MIPS KVM CPUs -M: James Hogan <jhogan@kernel.org> -R: Aleksandar Rikalo <aleksandar.rikalo@rt-rk.com> -S: Maintained +M: Aleksandar Markovic <aleksandar.m.mail@gmail.com> +S: Odd Fixes F: target/mips/kvm.c PPC KVM CPUs @@ -1006,6 +1005,7 @@ F: hw/mips/mips_malta.c F: hw/mips/gt64xxx_pci.c F: include/hw/southbridge/piix.h F: tests/acceptance/linux_ssh_mips_malta.py +F: tests/acceptance/machine_mips_malta.py Mipssim M: Aleksandar Markovic <amarkovic@wavecomp.com> |