Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
[oweals/u-boot.git] / drivers / mtd / nand / jz4740_nand.c
2011-10-12 Wolfgang DenkMerge branch 'master' of git://git.denx.de/u-boot-mips
2011-10-12 Xiangfu LiuMIPS: Jz4740: Add NAND driver