[coreboot-gerrit] Patch merged into coreboot/master: cbfstool: prefer fmap data over cbfs master header if it exists

the following patch was just integrated into master:
commit 2f953d304e02be9a2f4f6fbd86b41dd6c86ec5db
Author: Patrick Georgi 
Date:   Fri Sep 11 18:34:39 2015 +0200

cbfstool: prefer fmap data over cbfs master header if it exists

Up to now, if both fmap and a master header existed, the master header
    was used. Now, use the master header only if no fmap is found.

Change-Id: Iafbf2c9dc325597e23a9780b495549b5d912e9ad
    Signed-off-by: Patrick Georgi 
    Reviewed-on: http://review.coreboot.org/11629
    Tested-by: build bot (Jenkins)
    Reviewed-by: Aaron Durbin

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

-gerrit