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