Merge with /home/sr/git/u-boot/nand-ladis
authorWolfgang Denk <wd@denx.de>
Sat, 28 Oct 2006 23:12:53 +0000 (01:12 +0200)
committerWolfgang Denk <wd@denx.de>
Sat, 28 Oct 2006 23:12:53 +0000 (01:12 +0200)

Trivial merge