Merge branch 'next/cleanup-samsung-2' into for-next

author Kukjin Kim <kgene.kim@samsung.com>

Tue, 6 Nov 2012 23:54:54 +0000 (08:54 +0900)

committer Kukjin Kim <kgene.kim@samsung.com>

Tue, 6 Nov 2012 23:54:54 +0000 (08:54 +0900)
author Kukjin Kim <kgene.kim@samsung.com>
Tue, 6 Nov 2012 23:54:54 +0000 (08:54 +0900)
committer Kukjin Kim <kgene.kim@samsung.com>
Tue, 6 Nov 2012 23:54:54 +0000 (08:54 +0900)
diff --cc arch/arm/mach-exynos/mach-nuri.c
Simple merge
diff --cc arch/arm/mach-exynos/mach-origen.c
Simple merge
diff --cc arch/arm/mach-exynos/mach-smdk4x12.c
Simple merge
diff --cc arch/arm/mach-exynos/mach-smdkv310.c
Simple merge
diff --cc arch/arm/mach-exynos/mach-universal_c210.c
Simple merge
author	Kukjin Kim <kgene.kim@samsung.com>
	Tue, 6 Nov 2012 23:54:54 +0000 (08:54 +0900)
committer	Kukjin Kim <kgene.kim@samsung.com>
	Tue, 6 Nov 2012 23:54:54 +0000 (08:54 +0900)
		1	2
arch/arm/mach-exynos/mach-nuri.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos/mach-origen.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos/mach-smdk4x12.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos/mach-smdkv310.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos/mach-universal_c210.c	patch \|	diff1 \|	diff2 \|	blob \| history