Merge branch 'master' of git://git.denx.de/u-boot-arm

diff --cc Makefile
Simple merge

diff --cc boards.cfg
Simple merge

diff --cc common/cmd_nand.c
Simple merge

diff --cc drivers/mtd/nand/nand_base.c
Simple merge

diff --cc include/configs/flea3.h
Simple merge

diff --cc include/configs/mx35pdk.h
Simple merge

diff --cc include/linux/mtd/nand.h
Simple merge