Merge branch 'master' of git://git.denx.de/u-boot-arm
authorTom Rini <trini@ti.com>
Fri, 21 Sep 2012 21:53:13 +0000 (14:53 -0700)
committerTom Rini <trini@ti.com>
Fri, 21 Sep 2012 21:53:13 +0000 (14:53 -0700)
1  2 
Makefile
boards.cfg
common/cmd_nand.c
drivers/mtd/nand/nand_base.c
include/configs/flea3.h
include/configs/mx35pdk.h
include/linux/mtd/nand.h

diff --cc Makefile
Simple merge
diff --cc boards.cfg
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge