Merge branch 'master' of git://git.denx.de/u-boot-nand-flash
authorWolfgang Denk <wd@denx.de>
Thu, 4 Dec 2008 23:16:21 +0000 (00:16 +0100)
committerWolfgang Denk <wd@denx.de>
Thu, 4 Dec 2008 23:16:21 +0000 (00:16 +0100)

Trivial merge