Merge branch 'master' of git://www.denx.de/git/u-boot-nand-flash
authorWolfgang Denk <wd@denx.de>
Wed, 11 Jun 2008 20:23:09 +0000 (22:23 +0200)
committerWolfgang Denk <wd@denx.de>
Wed, 11 Jun 2008 20:23:09 +0000 (22:23 +0200)

Trivial merge