From: Wolfgang Denk Date: Wed, 18 May 2011 12:30:31 +0000 (+0200) Subject: Merge branch 'master' of git://git.denx.de/u-boot-nand-flash X-Git-Tag: v2011.06-rc1~25 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=ce6400a0f88f9648d6def519244ea8c33c7612b2;p=u-boot 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 --- ce6400a0f88f9648d6def519244ea8c33c7612b2