Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorMark Brown <broonie@kernel.org>
Mon, 9 Mar 2015 12:27:34 +0000 (12:27 +0000)
committerMark Brown <broonie@kernel.org>
Mon, 9 Mar 2015 12:27:34 +0000 (12:27 +0000)
commite8f1cafd746408478934b9c8b9e9e0d5f450906c
treef888010d088c8d8160bc694687fcd405ee832dc6
parent0a848fa4aaa30099fd8f80d475b2bb9d8f25e957
parentc810fcb930d9c705774427bb6eb551b2e1108adb
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
drivers/base/power/main.c
drivers/cpufreq/cpufreq.c
include/linux/cpufreq.h