| commit | d5cdfd5ec8351a26e701417ef9d3a0ba34666ce1 | [log] [tgz] |
|---|---|---|
| author | Tom Rini <trini@konsulko.com> | Sun Apr 14 00:03:06 2019 -0400 |
| committer | Tom Rini <trini@konsulko.com> | Sun Apr 14 00:03:06 2019 -0400 |
| tree | 08ee65c9c73a954c71b6f6051725338f0f23fdcb | |
| parent | 8540b63916bf7db8a4f990c52cc0a7f85bf2f598 [diff] | |
| parent | c4994512b9aa349abdd52507d188b3e147f04dce [diff] |
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>