Wolfgang Denk 0c0892be0d Merge branch 'master' of git://git.denx.de/u-boot-marvell ...

Conflicts:
	include/configs/km_arm.h

Signed-off-by: Wolfgang Denk <wd@denx.de>

2010-10-29 22:03:00 +02:00

..

arm

Merge branch 'master' of git://git.denx.de/u-boot-marvell

2010-10-29 22:03:00 +02:00

avr32

Replace CONFIG_RELOC_FIXUP_WORKS by CONFIG_NEEDS_MANUAL_RELOC

2010-10-29 21:32:07 +02:00

blackfin

Merge branch 'master' of git://git.denx.de/u-boot-blackfin

2010-10-29 21:46:08 +02:00

i386

Replace CONFIG_RELOC_FIXUP_WORKS by CONFIG_NEEDS_MANUAL_RELOC

2010-10-29 21:32:07 +02:00

m68k

Replace CONFIG_RELOC_FIXUP_WORKS by CONFIG_NEEDS_MANUAL_RELOC

2010-10-29 21:32:07 +02:00

microblaze

Replace CONFIG_RELOC_FIXUP_WORKS by CONFIG_NEEDS_MANUAL_RELOC

2010-10-29 21:32:07 +02:00

mips

Replace CONFIG_RELOC_FIXUP_WORKS by CONFIG_NEEDS_MANUAL_RELOC

2010-10-29 21:32:07 +02:00

nios2

Replace CONFIG_RELOC_FIXUP_WORKS by CONFIG_NEEDS_MANUAL_RELOC

2010-10-29 21:32:07 +02:00

powerpc

Replace CONFIG_RELOC_FIXUP_WORKS by CONFIG_NEEDS_MANUAL_RELOC

2010-10-29 21:32:07 +02:00

sh

Replace CONFIG_RELOC_FIXUP_WORKS by CONFIG_NEEDS_MANUAL_RELOC

2010-10-29 21:32:07 +02:00

sparc

Replace CONFIG_RELOC_FIXUP_WORKS by CONFIG_NEEDS_MANUAL_RELOC

2010-10-29 21:32:07 +02:00

.gitignore

update include/asm/ gitignore after move

2010-05-07 00:17:30 +02:00