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

Trivial merge