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

diff --cc MAINTAINERS
Simple merge

diff --cc Makefile
Simple merge

diff --cc README
Simple merge

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

diff --cc boards.cfg
Simple merge

diff --cc drivers/mmc/fsl_esdhc.c
Simple merge

diff --cc drivers/serial/serial_ns16550.c
Simple merge

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