tree 518fe0547c2ea9eafdf2a9278e007e3f348163d6
parent 37adfb67c6c543da5040b2a5b517aecc68955156
parent d99968f836d73ec9135e472fcaff3ca6728b5cc4
author Wolfgang Denk <wd@denx.de> 1306958367 +0200
committer Wolfgang Denk <wd@denx.de> 1306958367 +0200

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