tree a6a58200f5ea04c6d4ad2260dd031fcc6e4183ce
parent 083d506937002f2795c80fe0c3ae194ad2c3d085
parent bafe7437a4c21a8935ffbb5dfe8b5f1994b9f1d4
author Wolfgang Denk <wd@denx.de> 1287515272 +0200
committer Wolfgang Denk <wd@denx.de> 1287515272 +0200

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>