diff options
author | Jon Medhurst <tixy@linaro.org> | 2014-08-07 11:04:11 +0100 |
---|---|---|
committer | Jon Medhurst <tixy@linaro.org> | 2014-08-07 11:04:11 +0100 |
commit | fb79524507e6a61dc9b592ea232c62e51edde4b2 (patch) | |
tree | 1cc3a89776eff2c45bde16b3d0e2fa11fef4d1a4 /drivers/cpufreq/Kconfig.arm | |
parent | 362a2998f2aadd296423d6f62f60c7a54f6094bc (diff) | |
parent | ff5f4f9d70aff98cce32fd4ea898e47990995317 (diff) |
Merge branch 'tracking-armlt-juno' into integration-linaro-vexpress
Conflicts:
arch/arm64/boot/dts/Makefile
Diffstat (limited to 'drivers/cpufreq/Kconfig.arm')
0 files changed, 0 insertions, 0 deletions