Patch merged into coreboot/master: 8bd5bc7 change conflicted typedef in src/vendorcode/amd/agesa/f15/Porting.h

the following patch was just integrated into master:
commit 8bd5bc79149bbe98d2bf8052b5f01b16ccae0e64
Author: Siyuan Wang 
Date:   Fri Oct 19 21:02:39 2012 +0800

change conflicted typedef in src/vendorcode/amd/agesa/f15/Porting.h

src/vendorcode/amd/agesa/f15/Porting.h has some conflicted typedef with
    src/include/cpu/amd/common/cbtypes.h. These conflicted defines can lead to errors.

Change-Id: Idad0794018bf0bd0e4e52a5aa062a12766d56c8e
    Signed-off-by: Siyuan Wang 
    Signed-off-by: Siyuan Wang

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

-gerrit