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

diff --cc arch/arm/cpu/armv7/exynos/Kconfig
Simple merge

diff --cc arch/arm/cpu/armv7/exynos/clock.c
Simple merge

diff --cc arch/arm/cpu/armv7/exynos/spl_boot.c
Simple merge

diff --cc include/configs/arndale.h
Simple merge

diff --cc include/configs/smdk2410.h
Simple merge