Patch merged into coreboot/master: 2bbcde0 cbfstool: Fix LzmaEnc.c and build with -Wshadow

the following patch was just integrated into master:
commit 2bbcde0975991bb93b88649bc802a1d2101d05ee
Author: Alexandru Gagniuc 
Date:   Wed Jan 29 14:56:20 2014 -0600

cbfstool: Fix LzmaEnc.c and build with -Wshadow

LzmaEnc.c was full of shadow definitions. Luckily, shadow definitions
    were not used after the scope in which they were redefined, so it is
    possible to just remove them.

Tested by successfully booting qemu i440fx to grub2 payload.

Change-Id: I01d44db59882114ffe64434b655b931f3beec8e2
    Signed-off-by: Alexandru Gagniuc

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

-gerrit