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> |
||
---|---|---|
.. | ||
Makefile | ||
exynos5-dt.c | ||
lowlevel_init.S | ||
smdk5250.c | ||
smdk5250_spl.c |
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> |
||
---|---|---|
.. | ||
Makefile | ||
exynos5-dt.c | ||
lowlevel_init.S | ||
smdk5250.c | ||
smdk5250_spl.c |