• Tom Rini's avatar
    Merge branch 'master' of git://git.denx.de/u-boot-arm · 0ce033d2
    Tom Rini authored
    
    
    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: default avatarTom Rini <trini@ti.com>
    0ce033d2