Merge branch 'master' of git://git.denx.de/u-boot-arm
authorMinkyu Kang <mk7.kang@samsung.com>
Sat, 6 Feb 2010 08:20:09 +0000 (17:20 +0900)
committerMinkyu Kang <mk7.kang@samsung.com>
Sat, 6 Feb 2010 08:20:09 +0000 (17:20 +0900)
commitbdaef38171c9ea030bae46b798aba4f430dcac18
tree4da072aceaa42e7ff3ec9962f5d99a9ca667ace9
parented44387f406ca0e695609270a1282e699111a945
parentc20a3c0bac909a0a1311eaafdec156b6a8686d46
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>