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
..
Makefile	nios2: Offer ft_board_setup() capability and call fdt_fixup_ethernet().	2011-10-30 21:02:43 +08:00
cpu.c	nios2: Pseudo implement dcache_status/enable/disable()	2011-10-28 09:50:13 +08:00
epcs.c	Make sure that argv[] argument pointers are not modified.	2010-07-04 23:55:42 +02:00
exceptions.S	nios2: Move cpu/nios2/* to arch/nios2/cpu/*	2010-04-13 09:13:27 +02:00
fdt.c	Clean up libfdt.h includes	2013-02-08 22:32:38 -05:00
interrupts.c	nios2: implement get_ticks and get_tbclk	2012-02-23 08:31:20 +08:00
start.S	Replace __bss_end__ with __bss_end	2013-03-15 16:13:54 -04:00
sysid.c	Make sure that argv[] argument pointers are not modified.	2010-07-04 23:55:42 +02:00
traps.c	nios2: Move cpu/nios2/* to arch/nios2/cpu/*	2010-04-13 09:13:27 +02:00
u-boot.lds	Merge branch 'master' of git://git.denx.de/u-boot-arm	2013-03-18 14:37:18 -04:00