Merge branch 'master' of git://git.denx.de/u-boot-nand-flash
authorWolfgang Denk <wd@denx.de>
Fri, 3 Apr 2009 20:48:05 +0000 (22:48 +0200)
committerWolfgang Denk <wd@denx.de>
Fri, 3 Apr 2009 20:48:05 +0000 (22:48 +0200)

Trivial merge