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

author Tom Rini <trini@konsulko.com>

Mon, 14 Aug 2017 14:40:01 +0000 (10:40 -0400)

committer Tom Rini <trini@konsulko.com>

Mon, 14 Aug 2017 14:40:01 +0000 (10:40 -0400)
author Tom Rini <trini@konsulko.com>
Mon, 14 Aug 2017 14:40:01 +0000 (10:40 -0400)
committer Tom Rini <trini@konsulko.com>
Mon, 14 Aug 2017 14:40:01 +0000 (10:40 -0400)
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
author	Tom Rini <trini@konsulko.com>
	Mon, 14 Aug 2017 14:40:01 +0000 (10:40 -0400)
committer	Tom Rini <trini@konsulko.com>
	Mon, 14 Aug 2017 14:40:01 +0000 (10:40 -0400)
		1	2
drivers/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
include/configs/am43xx_evm.h	patch \|	diff1 \|	diff2 \|	blob \| history
include/configs/cm_t335.h	patch \|	diff1 \|	diff2 \|	blob \| history
include/configs/cm_t35.h	patch \|	diff1 \|	diff2 \|	blob \| history
include/configs/siemens-am33x-common.h	patch \|	diff1 \|	diff2 \|	blob \| history
include/configs/tao3530.h	patch \|	diff1 \|	diff2 \|	blob \| history