Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorMark Brown <broonie@linaro.org>
Wed, 23 Apr 2014 22:55:40 +0000 (23:55 +0100)
committerMark Brown <broonie@linaro.org>
Wed, 23 Apr 2014 22:55:40 +0000 (23:55 +0100)
commit8acfe32cb8716b76814e9a7c964354b91e5ce886
treef76d6d60eb454814bdad3d8edc08f5fc13f750fb
parent1fe07cd0c79781de1d565a15038e87480adc944a
parent08a92bdc033b579656887b1621511bcefa38dfab
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
drivers/base/power/main.c
drivers/cpufreq/cpufreq.c
include/linux/cpufreq.h