[flashrom-gerrit] Change in flashrom[master]: par_masters: Reshuffle to remove forward declarations