]> git.proxmox.com Git - mirror_qemu.git/commit
Merge remote-tracking branch 'remotes/mcayland/tags/qemu-sparc.for-upstream-20180914...
authorPeter Maydell <peter.maydell@linaro.org>
Tue, 25 Sep 2018 08:27:10 +0000 (09:27 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Tue, 25 Sep 2018 08:27:10 +0000 (09:27 +0100)
commit5b9000b52fba08a567f8efaa4aa56233b5f2a081
treed18f292edb3f9baa30e6305bd2926174b2cbc341
parent62713b199859a72adcb2eeb7b795ae6981668529
parent0a1d5c4596b2fcd3accfe2556e7fade8787ce6b6
Merge remote-tracking branch 'remotes/mcayland/tags/qemu-sparc.for-upstream-20180914' into staging

qemu-sparc.for-upstream queue

# gpg: Signature made Fri 14 Sep 2018 09:19:56 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-20180914:
  sun4u: implement custom FWPathProvider
  sabre: generate correct fw path for sabre PCI host bridge

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