Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorMark Brown <broonie@linaro.org>
Thu, 12 Dec 2013 00:26:47 +0000 (00:26 +0000)
committerMark Brown <broonie@linaro.org>
Thu, 12 Dec 2013 00:26:47 +0000 (00:26 +0000)
commitc4a3c95bcca5d9997e73c581b8cf6fb9adf8434c
tree9545810db2332c2435a4ed4754af4a882401e8ed
parent3ba8f67bac8f610b5148b93280387d3dccf7d0dd
parentfae4bb16eec6425bd37495d8fa7d70bde98b368b
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
drivers/cpufreq/Kconfig
include/linux/cpu.h