diff options
| author | Viresh Kumar <viresh.kumar@linaro.org> | 2012-07-16 16:10:14 +0100 |
|---|---|---|
| committer | Viresh Kumar <viresh.kumar@linaro.org> | 2012-07-16 16:10:14 +0100 |
| commit | dc56b26b3ea05693552b85253db6bfdd62c8f763 (patch) | |
| tree | 87037497e908003a93c27e1c900d6d7240f979e7 | |
| parent | a614bc613d8c726d01d54988154ab50447932ec6 (diff) | |
| parent | 25641f133ef9833142948fc3a413ff2ef00adc8a (diff) | |
| parent | dc67a715517acea6cda313cccf63bcd9c5eab482 (diff) | |
| parent | 22825452bf13c0ad0791237c69a9c27b638eec48 (diff) | |
| parent | cd5b11b15a4c9e142944668ce6efc44e261e9665 (diff) | |
Merge branches 'arm-asymmetric-support-v3', 'cpuidle-next-v4', 'per-cpu-thread-hotplug-v3', 'task-placement-v1' and 'config-fragments' into big-LITTLE-MP-v3big-LITTLE-MP-v3
Based on v3.5-rc7
$ git checkout -b big-LITTLE-MP-v3 v3.5-rc7
$ git merge arm-asymmetric-support-v3 cpuidle-next-v4 per-cpu-thread-hotplug-v3 per-task-load-average-v2 task-placement-v1 config-fragments