From: Peter Maydell <peter.maydell@linaro.org>
Date: Tue, 19 Jun 2018 15:57:43 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/rth/tags/pull-axp-20180618' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=727f8d87aaf8588fd6510ce310e61f757d3e7c46;p=qemu.git

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>
---

727f8d87aaf8588fd6510ce310e61f757d3e7c46