Merge branch 'master' of git://git.denx.de/u-boot-nand-flash
authorWolfgang Denk <wd@denx.de>
Mon, 11 Aug 2008 22:13:57 +0000 (00:13 +0200)
committerWolfgang Denk <wd@denx.de>
Mon, 11 Aug 2008 22:13:57 +0000 (00:13 +0200)

Trivial merge