[coreboot-gerrit] Patch merged into coreboot/master: cpu/x86: combine multiprocessor and SMM initialization