Merge remote-tracking branch 'remotes/mcayland/tags/qemu-sparc.for-upstream-20180820...
authorPeter Maydell <peter.maydell@linaro.org>
Tue, 21 Aug 2018 08:24:19 +0000 (09:24 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Tue, 21 Aug 2018 08:24:19 +0000 (09:24 +0100)
qemu-sparc.for-upstream queue

# gpg: Signature made Mon 20 Aug 2018 19:38:04 BST
# gpg:                using RSA key 5BC2C56FAE0F321F
# gpg: Good signature from "Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>"
# Primary key fingerprint: CC62 1AB9 8E82 200D 915C  C9C4 5BC2 C56F AE0F 321F

* remotes/mcayland/tags/qemu-sparc.for-upstream-20180820:
  sun4m: don't use legacy fw_cfg_init_mem() function
  sun4u: ensure kernel_top is always initialised

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

Trivial merge