Merge branch 'master' of git://git.denx.de/u-boot-nand-flash
authorWolfgang Denk <wd@denx.de>
Thu, 16 Dec 2010 22:16:02 +0000 (23:16 +0100)
committerWolfgang Denk <wd@denx.de>
Thu, 16 Dec 2010 22:16:02 +0000 (23:16 +0100)

Trivial merge