Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorMark Brown <broonie@kernel.org>
Fri, 21 Nov 2014 17:41:22 +0000 (17:41 +0000)
committerMark Brown <broonie@kernel.org>
Fri, 21 Nov 2014 17:41:22 +0000 (17:41 +0000)
1  2 
drivers/cpufreq/cpufreq.c

Simple merge