[coreboot-gerrit] Patch merged into coreboot/master: Revert "AMD OemS3Save: refactor for Merlin Falcon"

the following patch was just integrated into master:
commit bb85f9eb73d0b4d50a4d12246be6495b8cd8477f
Author: Kyösti Mälkki 
Date:   Sat Oct 31 18:06:52 2015 +0200

Revert "AMD OemS3Save: refactor for Merlin Falcon"

This reverts commit d3deecdd9c5c0a8031f2ea9d6c90e0997f123d93.

Do not mix open-source AGESA and binary PI trees. Once you have
    working S3 support for binaryPI platforms, add the adapted
    oem_s3.c file as northbridge/amd/pi/oem_s3.c instead.

Change-Id: I7c981d0023a5c0225e046f9c0104acfa07436b79
    Signed-off-by: Kyösti Mälkki 
    Reviewed-on: https://review.coreboot.org/12282
    Tested-by: build bot (Jenkins)
    Reviewed-by: Paul Menzel 
    Reviewed-by: Alexandru Gagniuc

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

-gerrit