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
..
arm_intcm	arm: factorize relocate_code routine	2013-05-30 20:24:38 +02:00
arm720t	arm: factorize relocate_code routine	2013-05-30 20:24:38 +02:00
arm920t	arm: make __image_copy_{start, end} compiler-generated	2013-06-21 23:05:05 +02:00
arm925t	arm: factorize relocate_code routine	2013-05-30 20:24:38 +02:00
arm926ejs	Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'	2013-06-28 17:51:13 +02:00
arm946es	arm: factorize relocate_code routine	2013-05-30 20:24:38 +02:00
arm1136	arm: Remove OMAP2420H4 and all omap24xx support	2013-06-10 08:43:19 -04:00
arm1176	arm: factorize relocate_code routine	2013-05-30 20:24:38 +02:00
armv7	Merge branch 'master' of git://git.denx.de/u-boot-arm	2013-07-12 10:36:48 -04:00
ixp	arm: make __rel_dyn_{start, end} compiler-generated	2013-06-21 23:05:29 +02:00
pxa	pxa: use -mcpu=xscale compiler option	2013-06-22 15:25:28 +02:00
s3c44b0	arm: factorize relocate_code routine	2013-05-30 20:24:38 +02:00
sa1100	arm: factorize relocate_code routine	2013-05-30 20:24:38 +02:00
tegra-common	ARM: tegra: only enable SCU on Tegra20	2013-06-06 09:12:32 -07:00
tegra20-common	Tegra: Split tegra_get_chip_type() into soc & sku funcs	2013-04-15 11:01:38 -07:00
tegra30-common	Tegra114: Initialize System Counter (TSC) with osc frequency	2013-04-15 11:01:38 -07:00
tegra114-common	Tegra114: Initialize System Counter (TSC) with osc frequency	2013-04-15 11:01:38 -07:00
u-boot-spl.lds	remove all references to .dynsym	2013-06-21 23:04:05 +02:00
u-boot.lds	arm: make __rel_dyn_{start, end} compiler-generated	2013-06-21 23:05:29 +02:00