[coreboot-gerrit] Change in ...coreboot[master]: WIP: temp for dispaly conflick