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

author Tom Rini <trini@konsulko.com>

Mon, 10 Dec 2018 12:16:33 +0000 (07:16 -0500)

committer Tom Rini <trini@konsulko.com>

Mon, 10 Dec 2018 12:16:33 +0000 (07:16 -0500)
author Tom Rini <trini@konsulko.com>
Mon, 10 Dec 2018 12:16:33 +0000 (07:16 -0500)
committer Tom Rini <trini@konsulko.com>
Mon, 10 Dec 2018 12:16:33 +0000 (07:16 -0500)
diff --cc arch/arm/dts/omap5-u-boot.dtsi
Simple merge
diff --cc board/ti/am57xx/board.c
Simple merge
diff --cc configs/am57xx_evm_defconfig
Simple merge
diff --cc configs/am57xx_hs_evm_defconfig
Simple merge
diff --cc configs/dra7xx_evm_defconfig
Simple merge
diff --cc configs/dra7xx_hs_evm_defconfig
Simple merge
author	Tom Rini <trini@konsulko.com>
	Mon, 10 Dec 2018 12:16:33 +0000 (07:16 -0500)
committer	Tom Rini <trini@konsulko.com>
	Mon, 10 Dec 2018 12:16:33 +0000 (07:16 -0500)
		1	2
arch/arm/dts/omap5-u-boot.dtsi	patch \|	diff1 \|	diff2 \|	blob \| history
board/ti/am57xx/board.c	patch \|	diff1 \|	diff2 \|	blob \| history
configs/am57xx_evm_defconfig	patch \|	diff1 \|	diff2 \|	blob \| history
configs/am57xx_hs_evm_defconfig	patch \|	diff1 \|	diff2 \|	blob \| history
configs/dra7xx_evm_defconfig	patch \|	diff1 \|	diff2 \|	blob \| history
configs/dra7xx_hs_evm_defconfig	patch \|	diff1 \|	diff2 \|	blob \| history