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
..
eb_cpu5282	Merge branch 'master' of git://git.denx.de/u-boot-arm	2013-03-18 14:37:18 -04:00
eb_cpux9k2	eb_cpux9k2: fix chip select	2012-09-03 22:11:49 +02:00
vl_ma2sc	arm:at91-boards: remove console_init_f where unnecessary	2012-09-01 17:06:14 +02:00