diff options
| author | Viresh Kumar <viresh.kumar@linaro.org> | 2012-09-17 09:26:07 +0530 |
|---|---|---|
| committer | Viresh Kumar <viresh.kumar@linaro.org> | 2012-09-17 09:26:07 +0530 |
| commit | eb07c27e2987ab3c16cedee1367694988efe3ff4 (patch) | |
| tree | f9a0999c82523fe8b6c5158710a3913edf334445 | |
| parent | ecd0225123a571dde42249e22086fbb47fb5d9b5 (diff) | |
| parent | 281ca656b95a6b9099eff17e76c908178c637833 (diff) | |
| parent | 4d62f5912a4faf5b04c8a19a44188317e0909aa3 (diff) | |
| parent | 6d24075f3a5e396423cbc90cea21ce8e3c5e2e52 (diff) | |
| parent | 6c7c89949f247bb9e7be1af9c2d6a792aa4df47c (diff) | |
| parent | ec3a17b94b09870468db575b95fa92c50c9cc778 (diff) | |
| parent | 8d5d37b7d230807ce7e97b186a00940c4f97449f (diff) | |
| parent | 23886096c72f683e13aae294093ec6d416b9d3b1 (diff) | |
Merge branches 'per-cpu-thread-hotplug-v3-fixed', 'task-placement-v2', 'cpu-hotplug-get_online_cpus-v1', 'arm-asymmetric-support-v3-v3.6-rc1', 'rcu-hotplug-v1', 'arm-multi_pmu_v1', 'scheduler-misc-v1' and 'config-fragments' into big-LITTLE-MP-v8tracking-big-LITTLE-MP-v8-llct-20120924.0tracking-big-LITTLE-MP-v8-llct-20120917.0big-LITTLE-MP-v8
Updates:
-------
- Based on v3.6-rc5
- new branch from Paulm: rcu-hotplug-v1, vincent: scheduler-misc-v1 and sudeepk arm-multi_pmu_v1
- new version of patches from Morten: task-placement-v2
- config fragment updated for fast & slow cpu
commands used for merge:
-----------------------
$ git checkout -b big-LITTLE-MP-v8 v3.6-rc5
$ git merge per-cpu-thread-hotplug-v3-fixed per-task-load-average-v3
task-placement-v2 cpu-hotplug-get_online_cpus-v1
arm-asymmetric-support-v3-v3.6-rc1 rcu-hotplug-v1 arm-multi_pmu_v1
scheduler-misc-v1 config-fragments