Merge branch 'next-samsung-board-2' into next-samsung-devel-2

diff --cc arch/arm/mach-exynos4/Kconfig
Simple merge

diff --cc arch/arm/mach-exynos4/clock.c
Simple merge

diff --cc arch/arm/mach-exynos4/cpu.c
Simple merge

diff --cc arch/arm/mach-exynos4/include/mach/irqs.h
Simple merge

diff --cc arch/arm/mach-exynos4/include/mach/map.h
Simple merge

diff --cc arch/arm/mach-exynos4/mach-origen.c
Simple merge

diff --cc arch/arm/mach-exynos4/mach-smdkv310.c
Simple merge