]> git.proxmox.com Git - mirror_qemu.git/commit
Merge remote-tracking branch 'remotes/mcayland/tags/qemu-macppc-20201112' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Thu, 12 Nov 2020 11:33:26 +0000 (11:33 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Thu, 12 Nov 2020 11:33:26 +0000 (11:33 +0000)
commitcb5d19e8294486551c422759260883ed290226d9
tree0c3ecd590e8fd28131e299e03046a04f84ed9d1b
parent674ee1245b4f14d998299d83410ac147e6e54eca
parent6bfa035ec31f4f5a14499f17e08f62e8f14760cc
Merge remote-tracking branch 'remotes/mcayland/tags/qemu-macppc-20201112' into staging

qemu-macppc fix for 5.2

# gpg: Signature made Thu 12 Nov 2020 09:50:45 GMT
# gpg:                using RSA key CC621AB98E82200D915CC9C45BC2C56FAE0F321F
# gpg:                issuer "mark.cave-ayland@ilande.co.uk"
# gpg: Good signature from "Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>" [full]
# Primary key fingerprint: CC62 1AB9 8E82 200D 915C  C9C4 5BC2 C56F AE0F 321F

* remotes/mcayland/tags/qemu-macppc-20201112:
  macio: set user_creatable to false in macio_class_init()

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