[coreboot] Re: Gerrit shows a Merge Conflict (was: Re: Denverton-NS refactoring)