| commit | 216800acf1fbf9f498455bf3c92d4513d9a4c681 | [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 | cf5eebeb18f7790d5030eb94f51fca0ebcd6e406 [diff] | |
| parent | 59aea29a31869ed0fd5ffc4b95050db966fcaf6d [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>