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)
commit8aebd75a4a7bfc6c7689e715bc1784c0add7d097
tree518fe0547c2ea9eafdf2a9278e007e3f348163d6
parent9f084b1e04d2337eb2ae32a6357b14b1260761d6
parenteb3abce898ce0d9c711ed1d107bd8b0ccf3c07de
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