diff options
| author | Mark Brown <broonie@linaro.org> | 2013-11-14 15:43:52 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-11-14 15:43:52 +0000 |
| commit | f3401c581ccf80d60107699c012da3f820f88b9e (patch) | |
| tree | 82ee3d8d33b52f71bd90e2fdee0a22df2ed581fc /kernel/sched/fair.c | |
| parent | 4cb518ab3d962ac6d0249f47a512127364ddf7da (diff) | |
| parent | 76e8de404a34bfff318da0b31e752db2642511f3 (diff) | |
Merge remote-tracking branch 'lsk/v3.10/topic/android-fixes' into linux-linaro-lsk-android
The cpufreq_interactive changes have been merged upstream and the local
version dropped.
Conflicts:
drivers/cpufreq/cpufreq_interactive.c
Diffstat (limited to 'kernel/sched/fair.c')
0 files changed, 0 insertions, 0 deletions