Merge branch 'v3.11-next/soc-exynos5420' into for-next

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

Tue, 18 Jun 2013 19:16:57 +0000 (04:16 +0900)

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

Tue, 18 Jun 2013 19:16:57 +0000 (04:16 +0900)
author Kukjin Kim <kgene.kim@samsung.com>
Tue, 18 Jun 2013 19:16:57 +0000 (04:16 +0900)
committer Kukjin Kim <kgene.kim@samsung.com>
Tue, 18 Jun 2013 19:16:57 +0000 (04:16 +0900)
diff --cc arch/arm/mach-exynos/Kconfig
Simple merge
diff --cc arch/arm/mach-exynos/common.c
Simple merge
diff --cc arch/arm/mach-exynos/include/mach/uncompress.h
Simple merge
diff --cc arch/arm/mach-exynos/mach-exynos5-dt.c
Simple merge
diff --cc arch/arm/mach-exynos/platsmp.c
Simple merge
author	Kukjin Kim <kgene.kim@samsung.com>
	Tue, 18 Jun 2013 19:16:57 +0000 (04:16 +0900)
committer	Kukjin Kim <kgene.kim@samsung.com>
	Tue, 18 Jun 2013 19:16:57 +0000 (04:16 +0900)
		1	2
arch/arm/mach-exynos/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos/common.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos/include/mach/uncompress.h	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos/mach-exynos5-dt.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos/platsmp.c	patch \|	diff1 \|	diff2 \|	blob \| history