Tom Rini 0ce033d258 Merge branch 'master' of git://git.denx.de/u-boot-arm ... Albert's rework of the linker scripts conflicted with Simon's making everyone use __bss_end. We also had a minor conflict over README.scrapyard being added to in mainline and enhanced in u-boot-arm/master with proper formatting. Conflicts: arch/arm/cpu/ixp/u-boot.lds arch/arm/cpu/u-boot.lds arch/arm/lib/Makefile board/actux1/u-boot.lds board/actux2/u-boot.lds board/actux3/u-boot.lds board/dvlhost/u-boot.lds board/freescale/mx31ads/u-boot.lds doc/README.scrapyard include/configs/tegra-common.h Build tested for all of ARM and run-time tested on am335x_evm. Signed-off-by: Tom Rini <trini@ti.com>		2013-03-18 14:37:18 -04:00
..
a320	arm: Move tbl to arch_global_data	2013-02-01 15:07:50 -05:00
at91	arm: Move lastinc to arch_global_data	2013-02-01 15:07:50 -05:00
ep93xx	Merge branch 'master' of git://git.denx.de/u-boot-arm	2013-03-18 14:37:18 -04:00
imx	Timer: Remove reset_timer_masked()	2011-07-26 14:54:15 +02:00
ks8695	arm: ks8695: use defined constants for UART	2012-10-26 23:32:11 +02:00
s3c24x0	arm: Move lastinc to arch_global_data	2013-02-01 15:07:50 -05:00
config.mk	Reduce build times	2011-11-03 20:44:58 +01:00
cpu.c	a/a/c/arm920t/cpu.c: remove CONFIG_AT91_LEGACY warning	2011-08-03 13:00:55 +02:00
interrupts.c	arm: Move cpu/$CPU to arch/arm/cpu/$CPU	2010-04-13 09:13:24 +02:00
Makefile	Switch from archive libraries to partial linking	2010-11-17 21:02:18 +01:00
start.S	Replace __bss_end__ with __bss_end	2013-03-15 16:13:54 -04:00