[coreboot-gerrit] Patch merged into coreboot/master: 2e04259 cbfstool: Fix shadowed global index