Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android

author Mark Brown <broonie@linaro.org>

Thu, 12 Dec 2013 00:26:47 +0000 (00:26 +0000)

committer Mark Brown <broonie@linaro.org>

Thu, 12 Dec 2013 00:26:47 +0000 (00:26 +0000)
author Mark Brown <broonie@linaro.org>
Thu, 12 Dec 2013 00:26:47 +0000 (00:26 +0000)
committer Mark Brown <broonie@linaro.org>
Thu, 12 Dec 2013 00:26:47 +0000 (00:26 +0000)
diff --cc drivers/cpufreq/Kconfig
Simple merge
diff --cc include/linux/cpu.h
Simple merge
author	Mark Brown <broonie@linaro.org>
	Thu, 12 Dec 2013 00:26:47 +0000 (00:26 +0000)
committer	Mark Brown <broonie@linaro.org>
	Thu, 12 Dec 2013 00:26:47 +0000 (00:26 +0000)
		1	2
drivers/cpufreq/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/cpu.h	patch \|	diff1 \|	diff2 \|	blob \| history