Merge branch 'master' of git://git.denx.de/u-boot-nand-flash
authorWolfgang Denk <wd@denx.de>
Tue, 30 Dec 2008 22:25:01 +0000 (23:25 +0100)
committerWolfgang Denk <wd@denx.de>
Tue, 30 Dec 2008 22:25:01 +0000 (23:25 +0100)

Trivial merge