Merge branch 'master' of git://git.denx.de/u-boot-nand-flash
authorWolfgang Denk <wd@denx.de>
Wed, 28 Jan 2009 22:14:22 +0000 (23:14 +0100)
committerWolfgang Denk <wd@denx.de>
Wed, 28 Jan 2009 22:14:22 +0000 (23:14 +0100)
commitc1b7c70083fc8d0bb77db20dd47bb6c988f3dc67
treebcce049dd321c99b6dc551fe015d9817df747c87
parent1fbcbe9a95f39afb2df6ab8cba25b284b47ebfb2
parentde832a99414ff06a4b2cdc9f5280b387da039834
Merge branch 'master' of git://git.denx.de/u-boot-nand-flash