Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorMark Brown <broonie@linaro.org>
Wed, 27 Nov 2013 10:57:19 +0000 (10:57 +0000)
committerMark Brown <broonie@linaro.org>
Wed, 27 Nov 2013 10:57:19 +0000 (10:57 +0000)
1  2 
drivers/cpufreq/cpufreq_stats.c

Simple merge