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

arm: fdt: Add skeleton device tree file from kernel

2012-03-29 08:12:47 +02:00

tegra20.dtsi

Tegra: fdt: Add/enhance sdhci (mmc) nodes for all T20 DT files

2013-03-14 11:06:42 -07:00

tegra30.dtsi

ARM: Tegra: FDT: Add USB EHCI function for T30/T114

2013-07-11 14:15:15 -07:00

tegra114.dtsi

ARM: Tegra: FDT: Add USB EHCI function for T30/T114

2013-07-11 14:15:15 -07:00