Tom Rini
authored
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>| Name | Last commit | Last update |
|---|---|---|
| .. | ||
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>| Name | Last commit | Last update |
|---|---|---|
| .. | ||