diff options
| author | Viresh Kumar <viresh.kumar@linaro.org> | 2012-09-03 15:52:42 +0530 |
|---|---|---|
| committer | Viresh Kumar <viresh.kumar@linaro.org> | 2012-09-03 15:52:42 +0530 |
| commit | 5ad1da269acf2b07235a526c8d2dad183acc5a9d (patch) | |
| tree | 5fba915e8a85cfc5389425693a797da516837715 | |
| parent | 44ccd47f6fc961de2fc71a378566c9c349102afa (diff) | |
| parent | 4fa6dc943575952034aad636b46748e47b35f621 (diff) | |
| parent | 0905327a269bac7719cc568dc741c732fafab355 (diff) | |
| parent | a728a9c43f76f9418bfe2c7a47cc5ece3d157ff6 (diff) | |
| parent | d622fdaea9bb8a886a2f57dd50517afaac4dda90 (diff) | |
Merge branches 'per-cpu-thread-hotplug-v3-fixed', 'task-placement-v1', 'cpu-hotplug-get_online_cpus-v1', 'arm-asymmetric-support-v3-v3.6-rc1' and 'config-fragments' into big-LITTLE-MP-v7big-LITTLE-MP-v7
Updates:
- Based on v3.6-rc3
- per-task-load-average-v3
- applied ARM-Add-HMP-scheduling-support-for-ARM-architecture to
task-placement-v1 branch
- applied Tixy's patch from fast-slow-cpu-dt-v1 to task-placement-v1 as they are
somewhat related only.
Commands used for merge:
$ gco -b big-LITTLE-MP-v7 v3.6-rc3
$ git merge per-cpu-thread-hotplug-v3-fixed per-task-load-average-v3
task-placement-v1 cpu-hotplug-get_online_cpus-v1
arm-asymmetric-support-v3-v3.6-rc1 config-fragments