diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-06-19 16:57:43 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-06-19 16:57:43 +0100 |
| commit | 727f8d87aaf8588fd6510ce310e61f757d3e7c46 (patch) | |
| tree | 76d8ea35289bb035e5e0df6047e5226476a47391 /slirp/dhcpv6.c | |
| parent | 0f01b9fdd4ba0a3d38e26e89e1b1faf1213eb4f1 (diff) | |
| parent | 75cacb128b2d39863a72f60cbefc0987cbcaf641 (diff) | |
| download | qemu-727f8d87aaf8588fd6510ce310e61f757d3e7c46.zip qemu-727f8d87aaf8588fd6510ce310e61f757d3e7c46.tar.gz qemu-727f8d87aaf8588fd6510ce310e61f757d3e7c46.tar.bz2 | |
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>
Diffstat (limited to 'slirp/dhcpv6.c')
0 files changed, 0 insertions, 0 deletions