Merge branch 'master' of git://git.denx.de/u-boot-nand-flash
authorWolfgang Denk <wd@denx.de>
Fri, 4 Feb 2011 20:44:46 +0000 (21:44 +0100)
committerWolfgang Denk <wd@denx.de>
Fri, 4 Feb 2011 20:44:46 +0000 (21:44 +0100)

Trivial merge