Merge branch 'master' of git://git.denx.de/u-boot-spi
authorTom Rini <trini@konsulko.com>
Sun, 14 Apr 2019 04:03:06 +0000 (00:03 -0400)
committerTom Rini <trini@konsulko.com>
Sun, 14 Apr 2019 04:03:06 +0000 (00:03 -0400)
commit216800acf1fbf9f498455bf3c92d4513d9a4c681
tree08ee65c9c73a954c71b6f6051725338f0f23fdcb
parentcf5eebeb18f7790d5030eb94f51fca0ebcd6e406
parent59aea29a31869ed0fd5ffc4b95050db966fcaf6d
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>
19 files changed:
MAINTAINERS
arch/arm/dts/armada-xp-theadorable.dts
arch/arm/dts/da850-evm-u-boot.dtsi
arch/arm/dts/keystone-k2g-evm.dts
arch/arm/dts/keystone-k2g-ice.dts
arch/arm/dts/stm32mp157c-ev1-u-boot.dtsi
arch/mips/dts/ap143.dts
arch/mips/dts/gardena-smart-gateway-mt7688.dts
arch/mips/dts/jr2_pcb110.dts
arch/mips/dts/jr2_pcb111.dts
arch/mips/dts/serval2_pcb112.dts
arch/mips/dts/servalt_pcb116.dts
arch/sandbox/dts/test.dts
board/sunxi/MAINTAINERS
configs/da850evm_defconfig
configs/mscc_jr2_defconfig
configs/mscc_servalt_defconfig
doc/git-mailrc
lib/fdtdec.c