Merge branch 'master' of git://git.denx.de/u-boot-nand-flash
authorWolfgang Denk <wd@denx.de>
Sat, 1 Nov 2008 15:18:43 +0000 (16:18 +0100)
committerWolfgang Denk <wd@denx.de>
Sat, 1 Nov 2008 15:18:43 +0000 (16:18 +0100)

Trivial merge