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> |
||
---|---|---|
.. | ||
common | ||
dts | ||
goni | ||
origen | ||
smdk2410 | ||
smdk5250 | ||
smdkc100 | ||
smdkv310 | ||
trats | ||
universal_c210 |