Merge branch 'master' of /home/wd/git/u-boot/custodians
authorWolfgang Denk <wd@denx.de>
Wed, 1 Jun 2011 19:59:27 +0000 (21:59 +0200)
committerWolfgang Denk <wd@denx.de>
Wed, 1 Jun 2011 19:59:27 +0000 (21:59 +0200)
* 'master' of /home/wd/git/u-boot/custodians:
  cmd_nand: fix help of nand erase subcommand
  env_nand: zero-initialize variable nand_erase_options


Trivial merge