Merge https://gitlab.denx.de/u-boot/custodians/u-boot-clk

author Tom Rini <[email protected]>

Fri, 2 Aug 2019 17:29:46 +0000 (13:29 -0400)

committer Tom Rini <[email protected]>

Fri, 2 Aug 2019 17:29:46 +0000 (13:29 -0400)
author Tom Rini <[email protected]>
Fri, 2 Aug 2019 17:29:46 +0000 (13:29 -0400)
committer Tom Rini <[email protected]>
Fri, 2 Aug 2019 17:29:46 +0000 (13:29 -0400)
diff --cc configs/sandbox_defconfig
Simple merge
diff --cc configs/sandbox_flattree_defconfig
Simple merge
author	Tom Rini <[email protected]>
	Fri, 2 Aug 2019 17:29:46 +0000 (13:29 -0400)
committer	Tom Rini <[email protected]>
	Fri, 2 Aug 2019 17:29:46 +0000 (13:29 -0400)
		1	2
configs/sandbox_defconfig	patch \|	diff1 \|	diff2 \|	blob \| history
configs/sandbox_flattree_defconfig	patch \|	diff1 \|	diff2 \|	blob \| history