Patch merged into coreboot/master: efc6aa0 vboot2: Allow merging verstage into bootblock

the following patch was just integrated into master:
commit efc6aa0eb928a27e625eb62ca848de7e191c5b67
Author: Patrick Georgi 
Date:   Mon Apr 27 18:13:50 2015 +0200

vboot2: Allow merging verstage into bootblock

Change-Id: I31cd7f84db8b7176c8854f33421aab5c176cd5ce
    Signed-off-by: Patrick Georgi 
    Reviewed-on: http://review.coreboot.org/10007
    Tested-by: build bot (Jenkins)
    Reviewed-by: Stefan Reinauer

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

-gerrit