Merge branch 'master' of git://git.denx.de/u-boot-nand-flash
authorWolfgang Denk <wd@denx.de>
Wed, 18 May 2011 12:30:31 +0000 (14:30 +0200)
committerWolfgang Denk <wd@denx.de>
Wed, 18 May 2011 12:30:31 +0000 (14:30 +0200)
commitce6400a0f88f9648d6def519244ea8c33c7612b2
tree175cba76cc9ee4b6557ddf6b00a79949005548ec
parente09e083f7ff1b0140c5d5a2bdc29902b7b23ffba
parente29816f3307624e019ffb0f4dbdc2945b3042118
Merge branch 'master' of git://git.denx.de/u-boot-nand-flash

* 'master' of git://git.denx.de/u-boot-nand-flash:
  nand_spl: nand_boot.c: Remove last CONFIG_SYS_NAND_READ_DELAY occurance