u-boot-brain/arch/arm
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
..
cpu Merge branch 'master' of git://git.denx.de/u-boot-arm 2013-07-12 10:36:48 -04:00
dts Merge branch 'master' of git://git.denx.de/u-boot-arm 2013-07-12 10:36:48 -04:00
imx-common arm: vf610: Add IOMUX support for Vybrid VF610 2013-06-03 10:56:53 +02:00
include/asm Merge branch 'master' of git://git.denx.de/u-boot-arm 2013-07-12 10:36:48 -04:00
lib Merge branch 'master' of git://git.denx.de/u-boot-arm 2013-07-12 10:36:48 -04:00
config.mk arm: ensure u-boot only uses relative relocations 2013-06-21 22:59:20 +02:00