Merge branch 'master' of git://git.denx.de/u-boot-arm
authorWolfgang Denk <wd@denx.de>
Tue, 12 Jan 2010 22:47:03 +0000 (23:47 +0100)
committerWolfgang Denk <wd@denx.de>
Tue, 12 Jan 2010 22:47:03 +0000 (23:47 +0100)
1  2 
drivers/mtd/nand/davinci_nand.c

Simple merge