u-boot/arch at e0987e251ff0eff25a55bf8db13a41f5849f59f7 - u-boot - Floatydustrial Evolution: code

minix/u-boot

mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-08-19 11:46:07 -04:00

History

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

..

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

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

Replace CONFIG_RELOC_FIXUP_WORKS by CONFIG_NEEDS_MANUAL_RELOC

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

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

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

Replace CONFIG_RELOC_FIXUP_WORKS by CONFIG_NEEDS_MANUAL_RELOC

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

Replace CONFIG_RELOC_FIXUP_WORKS by CONFIG_NEEDS_MANUAL_RELOC

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

Replace CONFIG_RELOC_FIXUP_WORKS by CONFIG_NEEDS_MANUAL_RELOC

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

Replace CONFIG_RELOC_FIXUP_WORKS by CONFIG_NEEDS_MANUAL_RELOC

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

Replace CONFIG_RELOC_FIXUP_WORKS by CONFIG_NEEDS_MANUAL_RELOC

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

Replace CONFIG_RELOC_FIXUP_WORKS by CONFIG_NEEDS_MANUAL_RELOC

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

Replace CONFIG_RELOC_FIXUP_WORKS by CONFIG_NEEDS_MANUAL_RELOC

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

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