[coreboot-gerrit] Patch merged into coreboot/master: skylake: fix garbled patch from upstream

the following patch was just integrated into master:
commit 25477e03a117f3f420146ffde4b5c1eda9f5493b
Author: Aaron Durbin 
Date:   Thu Jul 30 10:36:34 2015 -0500

skylake: fix garbled patch from upstream

In the review process for http://review.coreboot.org/#/c/11052/
    the code was mangled and the result was unbuildable code. Fix this.

BUG=chrome-os-partner:43419
    BRANCH=None
    TEST=Can actually build bootblock.

Original-Change-Id: I5bc63b8c435dbf025f1c334e9a1bc4a9da2b4902
    Original-Signed-off-by: Aaron Durbin 
    Original-Reviewed-on: https://chromium-review.googlesource.com/289788
    Original-Reviewed-by: Robbie Zhang 
    Original-Reviewed-by: Duncan Laurie 
    Original-Reviewed-by: Patrick Georgi

Change-Id: Id0f67d8b74fa9146bf01990f599d538222f7e0e2
    Signed-off-by: Aaron Durbin 
    Reviewed-on: http://review.coreboot.org/11167
    Tested-by: build bot (Jenkins)
    Reviewed-by: Patrick Georgi

See http://review.coreboot.org/11167 for details.

-gerrit