Merge remote-tracking branch 'lsk/v3.10/topic/arm64-bl-cpufreq' into linux-linaro-lsk
authorMark Brown <broonie@linaro.org>
Tue, 27 May 2014 16:25:03 +0000 (17:25 +0100)
committerMark Brown <broonie@linaro.org>
Tue, 27 May 2014 16:25:03 +0000 (17:25 +0100)
commit74d3aa5b4835831233251c99715e8e12aa9b0c1f
tree96b8a88827343ebc14e8ad74a25699b908091576
parent8352d7dd08ad3a89db6c65286d2b3567ba417879
parent3e692693dbc02420fd5bea45a51070121446ace6
Merge remote-tracking branch 'lsk/v3.10/topic/arm64-bl-cpufreq' into linux-linaro-lsk

Conflicts:
arch/arm64/Kconfig
drivers/cpufreq/Kconfig.arm
arch/arm64/Kconfig
drivers/cpufreq/Kconfig.arm