<p>Frans Hendriks <strong>abandoned</strong> this change.</p><p><a href="https://review.coreboot.org/29370">View Change</a></p><div style="white-space:pre-wrap">Abandoned

Merge conflict</div><p>To view, visit <a href="https://review.coreboot.org/29370">change 29370</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/29370"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: abandon </div>
<div style="display:none"> Gerrit-Change-Id: I58b69f8efb109c31f967eef2f7b6b3d5eeaa66fd </div>
<div style="display:none"> Gerrit-Change-Number: 29370 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Frans Hendriks <fhendriks@eltan.com> </div>
<div style="display:none"> Gerrit-Reviewer: Frans Hendriks <fhendriks@eltan.com> </div>
<div style="display:none"> Gerrit-Reviewer: Hannah Williams <hannah.williams@intel.com> </div>
<div style="display:none"> Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org> </div>