Patch merged into coreboot/master: cbfstool: Allow adding file with specific alignment requirement

the following patch was just integrated into master:
commit 38bc916def3a95f2a32309c5437ac0f868455a94
Author: Alexandru Gagniuc 
Date:   Mon Sep 7 00:05:44 2015 -0700

cbfstool: Allow adding file with specific alignment requirement

Whenever we want to add a file to CBFS with a specific alignment, we
    have to do two cbfstool invocations: one to find a place for the file,
    and another to actually add the file to CBFS. Get rid of this nonsense
    and allow this to be done in one step.

Change-Id: I526483296b494363f15dc169f163d93a6fc71bb0
    Signed-off-by: Alexandru Gagniuc 
    Reviewed-on: http://review.coreboot.org/11525
    Tested-by: build bot (Jenkins)
    Reviewed-by: Patrick Georgi

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

-gerrit