[coreboot-gerrit] Patch merged into coreboot/master: b142a51 qemu: q35: avoid address conflict