From: Wolfgang Denk Date: Wed, 1 Jun 2011 19:59:27 +0000 (+0200) Subject: Merge branch 'master' of /home/wd/git/u-boot/custodians X-Git-Tag: v2011.06-rc2~9 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=8aebd75a4a7bfc6c7689e715bc1784c0add7d097;p=oweals%2Fu-boot.git Merge branch 'master' of /home/wd/git/u-boot/custodians * 'master' of /home/wd/git/u-boot/custodians: cmd_nand: fix help of nand erase subcommand env_nand: zero-initialize variable nand_erase_options --- 8aebd75a4a7bfc6c7689e715bc1784c0add7d097