diff options
| author | Mark Brown <broonie@linaro.org> | 2013-07-19 10:42:11 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-07-19 10:42:11 +0100 |
| commit | 0b37fbf7508ff30e1d3668fea74e82f842448354 (patch) | |
| tree | 6d01fee5e95e1d4a8042ef473d61dd816b43d13e /drivers/cpufreq/cpufreq_governor.c | |
| parent | 0a37d59e3c8c2299f8931df0cb1c0f525047fab5 (diff) | |
| parent | a88f9e27498afaea615ad3e93af4f26df1f84987 (diff) | |
Merge branch 'experimental/android-3.10' of https://android.googlesource.com/kernel/common into linux-linaro-lsk-android
Conflicts:
arch/arm/include/asm/smp.h
arch/arm/kernel/smp.c
kernel/futex.c
Diffstat (limited to 'drivers/cpufreq/cpufreq_governor.c')
0 files changed, 0 insertions, 0 deletions