Merge branch 'master' of git://git.denx.de/u-boot-nand-flash
authorWolfgang Denk <wd@denx.de>
Tue, 17 Mar 2009 23:39:10 +0000 (00:39 +0100)
committerWolfgang Denk <wd@denx.de>
Tue, 17 Mar 2009 23:39:10 +0000 (00:39 +0100)

Trivial merge