Merge branch 'next/cleanup-samsung' into next/cleanup-samsung-2
Kukjin Kim [Tue, 6 Nov 2012 23:11:21 +0000 (08:11 +0900)]
1  2 
arch/arm/mach-exynos/clock-exynos4.c
arch/arm/mach-exynos/common.c
arch/arm/mach-exynos/include/mach/map.h
arch/arm/mach-exynos/mach-nuri.c
arch/arm/mach-exynos/mach-universal_c210.c
arch/arm/mach-s5pv210/mach-goni.c

Simple merge
Simple merge
Simple merge
Simple merge