[coreboot] Patch merged into coreboot/master: 060fba7 S3: Use old heap during normal boot

the following patch was just integrated into master:
commit 060fba770b8e067defb91ed7ba266fced87e438a
Author: zbao 
Date:   Wed Apr 18 16:59:53 2012 +0800

S3: Use old heap during normal boot

During normal boot, the cbmem is uninitialized. So it is illegal to find
    the heap in cbmem.

Change-Id: I8b5e1dbf1124819ed91693a86a6dbe41aea109e5
    Signed-off-by: Zheng Bao 
    Signed-off-by: zbao

Build-Tested: build bot (Jenkins) at Wed Apr 18 09:56:53 2012, giving +1
Reviewed-By: Marc Jones  at Thu Apr 19 01:02:45 2012, giving +2
See http://review.coreboot.org/904 for details.

-gerrit