diff options
| author | Viresh Kumar <viresh.kumar@linaro.org> | 2012-08-17 10:04:18 +0530 |
|---|---|---|
| committer | Viresh Kumar <viresh.kumar@linaro.org> | 2012-08-17 10:06:27 +0530 |
| commit | 7cb2bbaab2f26d1b4d2e6fde48b5712d162ec2d8 (patch) | |
| tree | f7b1625954fd25bf74cff230ec6fff4a7ef172ce | |
| parent | 0b939fb9c09afad9acc0e00c88c4a0eab6fa5f9b (diff) | |
| parent | d6c58a755c381e3dc4f4f1cce16ed4b46f1cd389 (diff) | |
| parent | 710ed2b64c670ea6280f4c72f329a8550ee02f8b (diff) | |
| parent | d622fdaea9bb8a886a2f57dd50517afaac4dda90 (diff) | |
Merge branches 'per-cpu-thread-hotplug-v3-fixed', 'fast-slow-cpu-dt-v1', 'cpu-hotplug-get_online_cpus-v1' and 'config-fragments' into big-LITTLE-MP-v6tracking-big-LITTLE-MP-v6-llct-20120822.0tracking-big-LITTLE-MP-v6-llct-20120821.0tracking-big-LITTLE-MP-v6-llct-20120820.1
Rebased over: v3.6-rc2
- Removed - arm-asymmetric-support-v3-v3.6-rc1
- Included - cpu-hotplug-get_online_cpus-v1
$ gco -b big-LITTLE-MP-v6 v3.6-rc2
$ git merge per-cpu-thread-hotplug-v3-fixed per-task-load-average-v2 task-placement-v1 fast-slow-cpu-dt-v1 cpu-hotplug-get_online_cpus-v1 config-fragments