tree 6e50a3f4eed22007549dc740d0fa647a6c8cec5b
parent b5bec88434adb52413f1bc33fa63d7642cb8fd35
parent b27673ccbd3d5435319b5c09c3e7061f559f925d
author Tom Rini <trini@ti.com> 1363624260 -0400
committer Tom Rini <trini@ti.com> 1363631838 -0400

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>