[coreboot-gerrit] New patch to review for coreboot: e15935d lenovo/t530: Fix merge conflict