diff options
| author | Viresh Kumar <viresh.kumar@linaro.org> | 2012-12-07 20:09:17 +0530 |
|---|---|---|
| committer | Viresh Kumar <viresh.kumar@linaro.org> | 2012-12-07 20:09:17 +0530 |
| commit | fba4f1ff31d4303efa7270936930c4e01931172a (patch) | |
| tree | 968576577ab51c4fa3491229ab37842e683e1ea1 | |
| parent | 993f3d3848630b312e3ff95f6c7a870dd97225dd (diff) | |
| parent | bb84ec16fc9ac705937100df83b61f33e2fbb679 (diff) | |
| parent | f48823fc8ef7626f6e97eb17c1c7d5b575e0b5f8 (diff) | |
| parent | 581add0ab10ce51b84235d34174f0a4e82fd398c (diff) | |
| parent | 680ab48373e58aa7c8d4c46aeb5c12bc8e65e09b (diff) | |
| parent | 3f1dff11ac95eda2772bef577e368bc124bfe087 (diff) | |
Merge branches 'arm-multi_pmu_v2', 'hw-bkp-v7.1-debug-v1', 'task-placement-v2-sysfs', 'misc-patches', 'config-fragments' and 'sched-pack-small-tasks-v1-arm' into big-LITTLE-MP-master-v13big-LITTLE-MP-master-v13
Updates:
-------
- Created more branches with same stuff to keep topics separated.
- Applied additional patch from Morten
Commands used for merge:
-----------------------
$ git checkout -b big-LITTLE-MP-master-v13 v3.7-rc5
$ git merge arm-multi_pmu_v2 hw-bkp-v7.1-debug-v1
per-task-load-average-v3-merged task-placement-v2 task-placement-v2-sysfs
misc-patches config-fragments sched-pack-small-tasks-v1-fixed
sched-pack-small-tasks-v1-arm
Conflicts:
kernel/sched/fair.c