Merge with /home/sr/git/u-boot/nand-timeout
authorWolfgang Denk <wd@pollux.denx.de>
Mon, 27 Nov 2006 21:49:11 +0000 (22:49 +0100)
committerWolfgang Denk <wd@denx.de>
Mon, 27 Nov 2006 21:49:11 +0000 (22:49 +0100)

Trivial merge