mirror of
https://git.codelinaro.org/clo/qsdk/oss/boot/u-boot-2016.git
synced 2026-03-14 04:50:19 +01:00
Fix a trivial conflict in arch/arm/dts/exynos5250.dtsi about gpio and serial. Conflicts: arch/arm/dts/exynos5250.dtsi Signed-off-by: Tom Rini <trini@ti.com> |
||
|---|---|---|
| .. | ||
| exynos5250.dtsi | ||
| skeleton.dtsi | ||
| tegra20.dtsi | ||
| tegra30.dtsi | ||
| tegra114.dtsi | ||