Patch merged into coreboot/master: a4cf83d cbfs: Fix mismerge.

the following patch was just integrated into master:
commit a4cf83df7a3ef3401e12ca3732cbe07294684d02
Author: Vladimir Serbinenko 
Date:   Tue Jun 2 21:40:29 2015 +0200

cbfs: Fix mismerge.

cbfs_get_file_content was replaced with cbfs_boot_map_with_leak but
    36f8d27ea9f741e184b76b5f42d7f777f207edc0 failed to get it into account.

Change-Id: I0c7840043b2ea6abaf8e70f4bf1a63c96aedebc1
    Signed-off-by: Vladimir Serbinenko 
    Reviewed-on: http://review.coreboot.org/10403
    Reviewed-by: Patrick Georgi 
    Tested-by: build bot (Jenkins)

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

-gerrit