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

diff --cc drivers/Makefile
Simple merge

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

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

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

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

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