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
..
2012-12-06 13:56:38 -07:00
2012-05-25 09:15:10 +02:00
2012-11-04 11:00:36 -07:00
2012-05-15 08:31:37 +02:00
2010-04-13 09:13:04 +02:00
2010-04-13 09:13:04 +02:00
2010-04-13 09:13:04 +02:00
2010-04-13 09:13:04 +02:00
2010-04-13 09:13:04 +02:00
2010-04-13 09:13:04 +02:00
2010-04-13 09:13:04 +02:00
2011-01-18 23:38:08 +01:00
2010-04-13 09:13:04 +02:00
2013-02-28 19:09:23 -08:00
2010-11-28 21:58:29 +01:00
2010-04-21 23:42:38 +02:00
2010-09-19 19:29:47 +02:00
2012-03-29 08:12:47 +02:00
2012-09-29 07:26:08 -07:00
2010-04-13 09:13:04 +02:00
2010-04-13 09:13:04 +02:00
2012-04-29 14:14:08 +02:00
2010-11-28 21:56:39 +01:00
2012-07-07 14:07:32 +02:00
2010-04-13 09:13:04 +02:00
2012-04-10 23:35:32 +02:00
2013-02-19 17:01:26 -05:00