Tom Rini fbbbc86e8e Merge branch 'master' of git://git.denx.de/u-boot-arm ...

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>

2013-07-12 10:36:48 -04:00

..

exynos5250.dtsi

Merge branch 'master' of git://git.denx.de/u-boot-arm

2013-07-12 10:36:48 -04:00

skeleton.dtsi

…

tegra20.dtsi

…

tegra30.dtsi

…

tegra114.dtsi

…