Patch merged into coreboot/master: soc/intel/common: use nvs.h include for nhlt code

the following patch was just integrated into master:
commit 36de4652e04fcc2c6d92886404c78225e7b6468c
Author: Aaron Durbin 
Date:   Wed Jun 29 17:28:02 2016 -0500

soc/intel/common: use nvs.h include for nhlt code

The nvs.h header is the one which defines global_nvs_t proper.
    Don't rely on an indirect inclusion.

Change-Id: I89d6a73f65e408c73f068b4a35b5efd361a6e5d3
    Signed-off-by: Aaron Durbin 
    Reviewed-on: https://review.coreboot.org/15503
    Reviewed-by: Furquan Shaikh 
    Tested-by: build bot (Jenkins)

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

-gerrit