Merge branch 'v3.11-next/driver-cpufreq' into v3.11-next/s3c24xx-driver

author Kukjin Kim <[email protected]>

Tue, 11 Jun 2013 20:24:22 +0000 (05:24 +0900)

committer Kukjin Kim <[email protected]>

Tue, 11 Jun 2013 20:24:22 +0000 (05:24 +0900)
author Kukjin Kim <[email protected]>
Tue, 11 Jun 2013 20:24:22 +0000 (05:24 +0900)
committer Kukjin Kim <[email protected]>
Tue, 11 Jun 2013 20:24:22 +0000 (05:24 +0900)
diff --cc arch/arm/Kconfig
Simple merge
diff --cc drivers/cpufreq/Kconfig.arm
Simple merge
author	Kukjin Kim <[email protected]>
	Tue, 11 Jun 2013 20:24:22 +0000 (05:24 +0900)
committer	Kukjin Kim <[email protected]>
	Tue, 11 Jun 2013 20:24:22 +0000 (05:24 +0900)
		1	2
arch/arm/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/cpufreq/Kconfig.arm	patch \|	diff1 \|	diff2 \|	blob \| history