Merge branch 'next-samsung-devel' into for-next

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

Fri, 19 Aug 2011 15:16:21 +0000 (00:16 +0900)

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

Fri, 19 Aug 2011 15:16:21 +0000 (00:16 +0900)
author Kukjin Kim <kgene.kim@samsung.com>
Fri, 19 Aug 2011 15:16:21 +0000 (00:16 +0900)
committer Kukjin Kim <kgene.kim@samsung.com>
Fri, 19 Aug 2011 15:16:21 +0000 (00:16 +0900)
diff --cc arch/arm/mach-exynos4/Kconfig
Simple merge
diff --cc arch/arm/mach-exynos4/mach-universal_c210.c
Simple merge
diff --cc arch/arm/mach-s3c64xx/mach-crag6410.c
Simple merge
author	Kukjin Kim <kgene.kim@samsung.com>
	Fri, 19 Aug 2011 15:16:21 +0000 (00:16 +0900)
committer	Kukjin Kim <kgene.kim@samsung.com>
	Fri, 19 Aug 2011 15:16:21 +0000 (00:16 +0900)
		1	2
arch/arm/mach-exynos4/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos4/mach-universal_c210.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c64xx/mach-crag6410.c	patch \|	diff1 \|	diff2 \|	blob \| history