tree 08ee65c9c73a954c71b6f6051725338f0f23fdcb
parent cf5eebeb18f7790d5030eb94f51fca0ebcd6e406
parent 59aea29a31869ed0fd5ffc4b95050db966fcaf6d
author Tom Rini <trini@konsulko.com> 1555214586 -0400
committer Tom Rini <trini@konsulko.com> 1555214586 -0400

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

Conflicts:
	arch/arm/dts/armada-385-amc.dts
	arch/arm/dts/armada-xp-theadorable.dts
	arch/arm/dts/stm32mp157c-ev1-u-boot.dtsi

Signed-off-by: Tom Rini <trini@konsulko.com>