Patch merged into coreboot/master: AMD OemS3Save: refactor for Merlin Falcon

the following patch was just integrated into master:
commit d3deecdd9c5c0a8031f2ea9d6c90e0997f123d93
Author: WANG Siyuan 
Date:   Fri Jun 12 16:41:50 2015 +0800

AMD OemS3Save: refactor for Merlin Falcon

Merlin Falcon(Carrizo) replaces struct AMD_S3SAVE_PARAMS
    with struct AMD_RTB_PARAMS and replaces AMD_S3_PARAMS with
    S3_DATA_BLOCK.

Change-Id: If074a8de95d82130d29b2e3cfbd7e35cdb9b929d
    Signed-off-by: WANG Siyuan 
    Signed-off-by: WANG Siyuan 
    Reviewed-on: http://review.coreboot.org/10526
    Tested-by: build bot (Jenkins)
    Reviewed-by: Marc Jones 
    Reviewed-by: Stefan Reinauer

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

-gerrit