[coreboot-gerrit] Patch merged into coreboot/master: e17843c cbfs: Fix overwalk on file scan

the following patch was just integrated into master:
commit e17843c4a75ce440e19d545ddb2e04372f548c07
Author: Steven Sherk 
Date:   Wed Aug 14 14:55:57 2013 -0600

cbfs: Fix overwalk on file scan

A bootblock overwalk was occuring when deriving the actual
    length, the bootblock size was not taken into account and bootblock
    size was not aligned.

Resolved merge conflict.

Change-Id: I7eb42f8deaaf223dcf07b37bb7dde4643acd508f
    Signed-off-by: Steven Sherk 
    Reviewed-on: https://gerrit.chromium.org/gerrit/65989
    Reviewed-by: Aaron Durbin 
    Commit-Queue: Steve Sherk 
    Tested-by: Steve Sherk 
    (cherry picked from commit 20b0ba479b01755fbdc7f3dd9214e8af923402ba)
    Signed-off-by: Isaac Christensen 
    Reviewed-on: http://review.coreboot.org/6539
    Tested-by: build bot (Jenkins)
    Reviewed-by: Paul Menzel 
    Reviewed-by: Patrick Georgi

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

-gerrit