Merge branch 'master' of git://git.denx.de/u-boot-nand-flash
authorWolfgang Denk <wd@denx.de>
Sun, 15 May 2011 21:23:36 +0000 (23:23 +0200)
committerWolfgang Denk <wd@denx.de>
Sun, 15 May 2011 21:23:36 +0000 (23:23 +0200)

Trivial merge