Merge remote branch 'u-boot-nand-flash/master'
authorWolfgang Denk <wd@denx.de>
Mon, 2 Jun 2008 22:16:48 +0000 (00:16 +0200)
committerWolfgang Denk <wd@denx.de>
Mon, 2 Jun 2008 22:16:48 +0000 (00:16 +0200)

Trivial merge