Patch merged into coreboot/master: google/smaug: roll up fixes to compile with vboot

the following patch was just integrated into master:
commit 84a124de6b776ea8eb81f1a09801fe802d06fc33
Author: Patrick Georgi 
Date:   Tue Jun 30 21:58:45 2015 +0200

google/smaug: roll up fixes to compile with vboot

Change-Id: I256410ff6c0107bbbaaf49b909d63ca61e88a22c
    Signed-off-by: Patrick Georgi 
    Reviewed-on: http://review.coreboot.org/10731
    Reviewed-by: Stefan Reinauer 
    Tested-by: build bot (Jenkins)

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

-gerrit