[coreboot-gerrit] [S] Change in coreboot[master]: HACK HACK changes required because of rebase HACK HACK