From: Wolfgang Denk <wd@denx.de>
Date: Wed, 1 Jun 2011 19:59:27 +0000 (+0200)
Subject: Merge branch 'master' of /home/wd/git/u-boot/custodians
X-Git-Tag: v2025.01-rc5-pxa1908~19400
X-Git-Url: http://git.dujemihanovic.xyz/login.html?a=commitdiff_plain;h=8aebd75a4a7bfc6c7689e715bc1784c0add7d097;p=u-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