Wolfgang Denk 6d8d4ef994 Merge branch 'elf_reloc' ... Conflicts: arch/arm/include/asm/config.h board/LaCie/edminiv2/config.mk board/karo/tx25/config.mk board/logicpd/imx27lite/config.mk doc/README.arm-relocation Signed-off-by: Wolfgang Denk <wd@denx.de>		2010-10-19 21:07:52 +02:00
..
asm	Merge branch 'elf_reloc'	2010-10-19 21:07:52 +02:00