727f8d87aa
-----BEGIN PGP SIGNATURE----- iQEcBAABAgAGBQJbJ+G+AAoJEGTfOOivfiFfOQ4IALAtAOYmExOA+iwEQ+ni1Mtw n8XqQ/c6ilUiMx8r/gGGaoKxmKEhu2Bb7ZQXScH9CfjxMlInL6FCJxVWUvP9spYe EFVt8Rx36f31hvCtgAzCl4g0ouScXxryClQ7volaSBoBaqIB9mK1gsrJhFIOjRVI PmnGelPEBc3Esnkm8RCZDX/achK5pNES0lRVaIrKqy9AcGwGaHJmsEpn7jcYCqTh oPyFsRD/PmRnPwapizas6eQ7C4cB3hcTEA0Is43OOzxG+6PA9EDUrCFvpymfZOwU 9dsCPNa1Lp4UqUN2bDt2B/u/TwchCR8/jXguuHZSbK0RUiY6I+6UnQAlWqd2u24= =9BBl -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/rth/tags/pull-axp-20180618' into staging Place parallel device properly, fixing vga # gpg: Signature made Mon 18 Jun 2018 17:45:50 BST # gpg: using RSA key 64DF38E8AF7E215F # gpg: Good signature from "Richard Henderson <richard.henderson@linaro.org>" # Primary key fingerprint: 7A48 1E78 868B 4DB6 A85A 05C0 64DF 38E8 AF7E 215F * remotes/rth/tags/pull-axp-20180618: hw/isa/smc37c669: Change the parallel I/O base to 378H Signed-off-by: Peter Maydell <peter.maydell@linaro.org>