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

diff --cc board/ti/am335x/board.c
Simple merge

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

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

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

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

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

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

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

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

diff --cc include/configs/siemens-am33x-common.h
Simple merge

diff --cc include/configs/tam3517-common.h
Simple merge

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