From: Peter Maydell Date: Wed, 17 Mar 2021 10:38:27 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/vivier/tags/m68k-for-6.0-pull-request' into... X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ff81439aafac58887b18032acd18a117f534cd75;p=qmiga%2Fqemu.git Merge remote-tracking branch 'remotes/vivier/tags/m68k-for-6.0-pull-request' into staging m68k pull request 20210315 Add m68k virt machine # gpg: Signature made Mon 15 Mar 2021 20:41:51 GMT # gpg: using RSA key CD2F75DDC8E3A4DC2E4F5173F30C38BD3F2FBE3C # gpg: issuer "laurent@vivier.eu" # gpg: Good signature from "Laurent Vivier " [full] # gpg: aka "Laurent Vivier " [full] # gpg: aka "Laurent Vivier (Red Hat) " [full] # Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F 5173 F30C 38BD 3F2F BE3C * remotes/vivier/tags/m68k-for-6.0-pull-request: m68k: add Virtual M68k Machine m68k: add a system controller m68k: add an interrupt controller hw/intc: add goldfish-pic hw/char: add goldfish-tty Signed-off-by: Peter Maydell --- ff81439aafac58887b18032acd18a117f534cd75