diff options
| author | Viresh Kumar <viresh.kumar@linaro.org> | 2012-09-11 10:01:43 +0530 |
|---|---|---|
| committer | Viresh Kumar <viresh.kumar@linaro.org> | 2012-09-11 10:01:43 +0530 |
| commit | 09909f74587ebf7a80738816b708ac3d98b47c35 (patch) | |
| tree | 7d77c3d0b9a52a3d780c6c1e4a3b9eed625b2605 | |
| parent | ecd0225123a571dde42249e22086fbb47fb5d9b5 (diff) | |
| parent | ef16a0a3e621dd601d095ca227066814fa763e93 (diff) | |
| parent | 4d62f5912a4faf5b04c8a19a44188317e0909aa3 (diff) | |
| parent | 6d24075f3a5e396423cbc90cea21ce8e3c5e2e52 (diff) | |
| parent | 6c7c89949f247bb9e7be1af9c2d6a792aa4df47c (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', 'rcu-hotplug-v1' and 'config-fragments' into big-LITTLE-MP-v8tracking-big-LITTLE-MP-v8-llct-20120911.0
Updates:
- Based on v3.6-rc5
- applied sched: "fix arch_get_fast_and_slow_cpus to get logical cpumask
correctly" to task-placement-v1 branch
- new branch from Paulm: rcu-hotplug-v1
Commands used for merge:
$ gco -b big-LITTLE-MP-v8 v3.6-rc5
$ 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 rcu-hotplug-v1 config-fragments