Merge with /home/sr/git/u-boot/nand-timeout
authorWolfgang Denk <[email protected]>
Mon, 27 Nov 2006 21:49:11 +0000 (22:49 +0100)
committerWolfgang Denk <[email protected]>
Mon, 27 Nov 2006 21:49:11 +0000 (22:49 +0100)

Trivial merge