From: Peter Maydell Date: Mon, 20 Feb 2017 11:55:37 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/huth/tags/coldfire-20170219' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=5d42ff913bb294c661aed8dfcd386fed9e185148;p=qemu.git Merge remote-tracking branch 'remotes/huth/tags/coldfire-20170219' into staging Updates for the m68k ColdFire machines: - Remove the obsolete dummy machine - QOMify the ColdFire interrupt controller - Volunteer for maintaining the orphan ColdFire boards # gpg: Signature made Sat 18 Feb 2017 23:08:55 GMT # gpg: using RSA key 0x2ED9D774FE702DB5 # gpg: Good signature from "Thomas Huth " # gpg: aka "Thomas Huth " # gpg: aka "Thomas Huth " # Primary key fingerprint: 27B8 8847 EEE0 2501 18F3 EAB9 2ED9 D774 FE70 2DB5 * remotes/huth/tags/coldfire-20170219: MAINTAINERS: Add odd fixer for the ColdFire boards hw/m68k: QOMify the ColdFire interrupt controller hw/m68k: Remove dummy machine Signed-off-by: Peter Maydell --- 5d42ff913bb294c661aed8dfcd386fed9e185148