Patch merged into coreboot/master: skylake: Add and fill out CID1 NVS field

the following patch was just integrated into master:
commit 3d3b76b8321ea2106e2bd2595097accbf6ac9eb9
Author: Duncan Laurie 
Date:   Thu Feb 25 08:45:43 2016 -0800

skylake: Add and fill out CID1 NVS field

Add a country identifier field to NVS and populate it with the
    call to wifi_regulatory_domain() which will (by default) do a
    lookup for the 'region' identifier in VPD on a Chrome OS device.

BUG=chrome-os-partner:50516
    BRANCH=glados
    TEST=build and boot on chell

Change-Id: Ie7531848e620095732772c22156a85b7f8a6df5c
    Signed-off-by: Patrick Georgi 
    Original-Commit-Id: dafdb3760a0302e3effdc0e83977c1bfd5c9d3b2
    Original-Change-Id: Ic83ab008045a469d0e0756f7e4d42f1b3894c529
    Original-Signed-off-by: Duncan Laurie 
    Original-Reviewed-on: https://chromium-review.googlesource.com/329295
    Original-Reviewed-by: Aaron Durbin 
    Reviewed-on: https://review.coreboot.org/13839
    Tested-by: build bot (Jenkins)
    Reviewed-by: Paul Menzel 
    Reviewed-by: Stefan Reinauer

See https://review.coreboot.org/13839 for details.

-gerrit