Patch merged into coreboot/master: b275757 cbfstool: account for the trampoline code in bzImage payload

the following patch was just integrated into master:
commit b2757572121f503176ebdc311591536336811953
Author: Aaron Durbin 
Date:   Thu May 8 11:54:25 2014 -0500

cbfstool: account for the trampoline code in bzImage payload

For bzImages the trampoline segment is added unconditionally.
    However, that segment wasn't properly being accounted for.
    Explicitly add the trampoline segments like the other ones.

Change-Id: I74f6fcc2a65615bb87578a8a3a76cecf858fe856
    Signed-off-by: Aaron Durbin 
    Reviewed-on: http://review.coreboot.org/5702
    Tested-by: build bot (Jenkins)
    Reviewed-by: Paul Menzel 
    Reviewed-by: Edward O'Callaghan 
    Reviewed-by: Patrick Georgi

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

-gerrit