From: Minkyu Kang <mk7.kang@samsung.com>
Date: Sat, 6 Feb 2010 08:20:09 +0000 (+0900)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-arm
X-Git-Tag: v2010.09-rc1~28^2~7^2~27
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=bdaef38171c9ea030bae46b798aba4f430dcac18;p=u-boot

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

Conflicts:

	cpu/arm_cortexa8/s5pc1xx/cache.c
	include/configs/spear6xx.h
	lib_ppc/reloc.S

Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
---

bdaef38171c9ea030bae46b798aba4f430dcac18