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

..

arm720t

Drop support for CONFIG_SKIP_RELOCATE_UBOOT

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

arm920t

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

2010-10-29 21:47:48 +02:00

arm925t

Drop support for CONFIG_SKIP_RELOCATE_UBOOT

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

arm926ejs

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

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

arm946es

Drop support for CONFIG_SKIP_RELOCATE_UBOOT

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

arm1136

Drop support for CONFIG_SKIP_RELOCATE_UBOOT

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

arm1176

Drop support for CONFIG_SKIP_RELOCATE_UBOOT

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

arm_intcm

Drop support for CONFIG_SKIP_RELOCATE_UBOOT

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

armv7

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

2010-10-29 21:50:24 +02:00

ixp

Drop support for CONFIG_SKIP_RELOCATE_UBOOT

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

lh7a40x

Drop support for CONFIG_SKIP_RELOCATE_UBOOT

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

pxa

Merge branch 'for-wd-master' of git://git.denx.de/u-boot-pxa

2010-10-29 21:44:40 +02:00

s3c44b0

Drop support for CONFIG_SKIP_RELOCATE_UBOOT

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

sa1100

Drop support for CONFIG_SKIP_RELOCATE_UBOOT

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