Merge branch 'next' of git://git.denx.de/u-boot-nand-flash into next
authorWolfgang Denk <wd@denx.de>
Sat, 21 Nov 2009 22:17:57 +0000 (23:17 +0100)
committerWolfgang Denk <wd@denx.de>
Sat, 21 Nov 2009 22:17:57 +0000 (23:17 +0100)

Trivial merge