diff options
| author | Viresh Kumar <viresh.kumar@linaro.org> | 2012-07-26 10:31:09 +0100 |
|---|---|---|
| committer | Viresh Kumar <viresh.kumar@linaro.org> | 2012-07-26 10:31:09 +0100 |
| commit | 0c14bef759036920bc81d133518c4509a0ec9428 (patch) | |
| tree | a11d660dfc8e622ef7244f7c8c69d8d2c4caefb3 | |
| parent | 0425e0da43fda1940266893a3a3173c392869eeb (diff) | |
| parent | 4f51412c71edab8b3033ea97f84bc0b94470287b (diff) | |
| parent | 0ce23d9b87b72b1c7601daa5226a9b6f011e7939 (diff) | |
| parent | 83ce6a1760deba496a4dbb1ae4ce608e914044c3 (diff) | |
| parent | 5556f0d930354f7172411b5c70a5b5fcfaa7f6bc (diff) | |
| parent | cd5b11b15a4c9e142944668ce6efc44e261e9665 (diff) | |
Merge branches 'arm-asymmetric-support-v3', 'cpuidle-next-v4', 'per-cpu-thread-hotplug-v3-fixed', 'fast-slow-cpu-dt-v1', 'wq-hotplug-v1' and 'config-fragments' into big-LITTLE-MP-v4big-LITTLE-MP-v4
Based on v3.5
$ gco -b big-LITTLE-MP-v4 v3.5
$ git merge arm-asymmetric-support-v3 cpuidle-next-v4 per-cpu-thread-hotplug-v3-fixed per-task-load-average-v2 task-placement-v1 fast-slow-cpu-dt-v1 wq-hotplug-v1 config-fragments