| 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> | ||
|---|---|---|
| .. | ||
| cpu | ||
| dts | ||
| include/asm | ||
| lib | ||
| Kconfig | ||
| Makefile | ||
| config.mk | ||
| 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> | ||
|---|---|---|
| .. | ||
| cpu | ||
| dts | ||
| include/asm | ||
| lib | ||
| Kconfig | ||
| Makefile | ||
| config.mk | ||