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

Trivial merge