]> git.proxmox.com Git - mirror_qemu.git/commitdiff
Merge tag 'm68k-for-6.2-pull-request' of git://github.com/vivier/qemu-m68k into staging
authorRichard Henderson <richard.henderson@linaro.org>
Tue, 9 Nov 2021 12:16:55 +0000 (13:16 +0100)
committerRichard Henderson <richard.henderson@linaro.org>
Tue, 9 Nov 2021 12:16:56 +0000 (13:16 +0100)
m68k pull request 20211109

Add virt machine types for 6.1 and 6.2

# gpg: Signature made Tue 09 Nov 2021 12:14:39 PM CET
# gpg:                using RSA key CD2F75DDC8E3A4DC2E4F5173F30C38BD3F2FBE3C
# gpg:                issuer "laurent@vivier.eu"
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [full]
# gpg:                 aka "Laurent Vivier <laurent@vivier.eu>" [full]
# gpg:                 aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" [full]

* tag 'm68k-for-6.2-pull-request' of git://github.com/vivier/qemu-m68k:
  hw: m68k: virt: Add compat machine for 6.2
  hw: m68k: virt: Add compat machine for 6.1

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
1  2 
hw/m68k/virt.c

diff --cc hw/m68k/virt.c
Simple merge