u-boot-brain/arch/arm
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
..
cpu Merge branch 'master' of git://git.denx.de/u-boot-marvell 2010-10-29 22:03:00 +02:00
include/asm Merge branch 'master' of git://git.denx.de/u-boot-imx 2010-10-29 21:50:24 +02:00
lib Drop support for CONFIG_SYS_ARM_WITHOUT_RELOC 2010-10-29 21:39:59 +02:00
config.mk Drop support for CONFIG_SYS_ARM_WITHOUT_RELOC 2010-10-29 21:39:59 +02:00