Merge branch 'dev/s5pv310-cpufreq' into next-s5pv310

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

Mon, 3 Jan 2011 09:58:50 +0000 (18:58 +0900)

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

Mon, 3 Jan 2011 09:58:50 +0000 (18:58 +0900)
author Kukjin Kim <kgene.kim@samsung.com>
Mon, 3 Jan 2011 09:58:50 +0000 (18:58 +0900)
committer Kukjin Kim <kgene.kim@samsung.com>
Mon, 3 Jan 2011 09:58:50 +0000 (18:58 +0900)
diff --cc arch/arm/mach-s5pv310/Makefile
Simple merge
diff --cc arch/arm/mach-s5pv310/cpu.c
Simple merge
diff --cc arch/arm/mach-s5pv310/include/mach/map.h
Simple merge
author	Kukjin Kim <kgene.kim@samsung.com>
	Mon, 3 Jan 2011 09:58:50 +0000 (18:58 +0900)
committer	Kukjin Kim <kgene.kim@samsung.com>
	Mon, 3 Jan 2011 09:58:50 +0000 (18:58 +0900)
		1	2
arch/arm/mach-s5pv310/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s5pv310/cpu.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s5pv310/include/mach/map.h	patch \|	diff1 \|	diff2 \|	blob \| history