]> git.sur5r.net Git - u-boot/commit
Merge branch 'elf_reloc'
authorWolfgang Denk <wd@denx.de>
Tue, 19 Oct 2010 19:07:52 +0000 (21:07 +0200)
committerWolfgang Denk <wd@denx.de>
Tue, 19 Oct 2010 19:07:52 +0000 (21:07 +0200)
commit6d8d4ef994a7c46e34b5fe53b1af7aa4f78192bf
treea6a58200f5ea04c6d4ad2260dd031fcc6e4183ce
parent083d506937002f2795c80fe0c3ae194ad2c3d085
parentbafe7437a4c21a8935ffbb5dfe8b5f1994b9f1d4
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>
arch/arm/cpu/arm1136/start.S
arch/arm/cpu/arm926ejs/start.S
arch/arm/cpu/armv7/start.S
arch/arm/include/asm/config.h
arch/arm/lib/board.c
board/LaCie/edminiv2/config.mk
board/karo/tx25/config.mk
board/logicpd/imx27lite/config.mk
doc/README.arm-relocation